--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserFactoryImpl.java	Wed Dec 23 17:13:18 2009 -0800
@@ -0,0 +1,58 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.sdk.internal;
+
+import java.net.SocketAddress;
+
+import org.chromium.sdk.Browser;
+import org.chromium.sdk.BrowserFactory;
+import org.chromium.sdk.ConnectionLogger;
+import org.chromium.sdk.StandaloneVm;
+import org.chromium.sdk.internal.transport.Handshaker;
+import org.chromium.sdk.internal.transport.SocketConnection;
+
+/**
+ * A default implementation of the BrowserFactory interface.
+ */
+public class BrowserFactoryImpl extends BrowserFactory {
+
+  private static final int DEFAULT_CONNECTION_TIMEOUT_MS = 1000;
+
+  @Override
+  public Browser create(SocketAddress socketAddress,
+      ConnectionLogger.Factory connectionLoggerFactory) {
+    SocketConnectionFactory socketConnectionFactory = new SocketConnectionFactory(socketAddress,
+        getTimeout(), connectionLoggerFactory, Handshaker.CHROMIUM);
+    return new BrowserImpl(socketConnectionFactory);
+  }
+
+  // Debug entry (no logger by definition)
+  Browser create(ConnectionFactory connectionFactory) {
+    return new BrowserImpl(connectionFactory);
+  }
+
+  @Override
+  public StandaloneVm createStandalone(SocketAddress socketAddress,
+      ConnectionLogger connectionLogger) {
+    Handshaker.StandaloneV8 handshaker = new Handshaker.StandaloneV8();
+    SocketConnection connection =
+        new SocketConnection(socketAddress, getTimeout(), connectionLogger, handshaker);
+    return new StandaloneVmImpl(connection, handshaker);
+  }
+
+  private int getTimeout() {
+    String timeoutString = System.getProperty(
+        "org.chromium.sdk.client.connection.timeoutMs",
+        String.valueOf(DEFAULT_CONNECTION_TIMEOUT_MS));
+    int timeoutMs = DEFAULT_CONNECTION_TIMEOUT_MS;
+    try {
+      timeoutMs = Integer.parseInt(timeoutString);
+    } catch (NumberFormatException e) {
+      // fall through and use the default value
+    }
+    return timeoutMs;
+  }
+
+}