Add support for multiple asynchronous browser startups.

chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index b53c80d876715eb312d7e7d862802d76358dc5b7..5955e776781f68f11901d90bf7277c2cff3858e7 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -15,14 +15,12 @@ import org.chromium.base.ChromiumActivity;
 import org.chromium.base.MemoryPressureListener;
 import org.chromium.chrome.browser.DevToolsServer;
 import org.chromium.content.browser.ActivityContentVideoViewClient;
-import org.chromium.content.browser.AndroidBrowserProcess;
-import org.chromium.content.browser.BrowserStartupConfig;
+import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.DeviceUtils;
 import org.chromium.content.common.CommandLine;
-import org.chromium.content.common.ProcessInitException;
 import org.chromium.ui.WindowAndroid;
 
 /**
@@ -59,7 +57,8 @@ public class ChromiumTestShellActivity extends ChromiumActivity {
 
         DeviceUtils.addDeviceSpecificUserAgentSwitch(this);
 
-        BrowserStartupConfig.setAsync(new BrowserStartupConfig.StartupCallback() {
+        BrowserStartupController.StartupCallback callback =
+                new BrowserStartupController.StartupCallback() {
             @Override
             public void run(int startupResult) {
                 if (startupResult > 0) {
@@ -70,15 +69,9 @@ public class ChromiumTestShellActivity extends ChromiumActivity {
                     finishInitialization(savedInstanceState);
                 }
             }
-        });
-
-        try {
-            if (!AndroidBrowserProcess.init(this, AndroidBrowserProcess.MAX_RENDERERS_LIMIT)) {
-                // Process was already running, finish initialization now.
-                finishInitialization(savedInstanceState);
-            }
-        } catch (ProcessInitException e) {
-            Log.e(TAG, "Chromium browser process initialization failed", e);
+        };
+        if (!BrowserStartupController.get(this).startBrowserProcessesAsync(callback)) {

[bulach, 2013/08/15 15:09:12]

nit: I suppose "this /* context */" would be clearer..

+            Log.e(TAG, "Chromium browser process initialization failed");
             finish();
         }
     }