Don't enable asynchronous browser startup when running layout tests.

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index e24835b8efd464ca607c79146964f76a26cf2d05..3f7ceb08898a87f109ba0f546502d1c0da4841bc 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -93,19 +93,21 @@ public class ContentShellActivity extends ChromiumActivity {
                 mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));
             }
 
-            BrowserStartupConfig.setAsync(new BrowserStartupConfig.StartupCallback() {
-
-                @Override
-                public void run(int startupResult) {
-                    if (startupResult > 0) {
-                        // TODO: Show error message.
-                        Log.e(TAG, "ContentView initialization failed.");
-                        finish();
-                    } else {
-                        finishInitialization();
+            if (!CommandLine.getInstance().hasSwitch(CommandLine.DUMP_RENDER_TREE)) {
+                BrowserStartupConfig.setAsync(new BrowserStartupConfig.StartupCallback() {
+
+                    @Override
+                    public void run(int startupResult) {
+                        if (startupResult > 0) {
+                            // TODO: Show error message.
+                            Log.e(TAG, "ContentView initialization failed.");
+                            finish();
+                        } else {
+                            finishInitialization();
+                        }
                     }
-                }
-            });
+                });
+            }
 
             if (!AndroidBrowserProcess.init(this, AndroidBrowserProcess.MAX_RENDERERS_LIMIT)) {
                 String shellUrl = ShellManager.DEFAULT_SHELL_URL;