diff --git a/src/com/android/browser/EngineInitializer.java b/src/com/android/browser/EngineInitializer.java
index 7a0c236..27ffbe0 100644
--- a/src/com/android/browser/EngineInitializer.java
+++ b/src/com/android/browser/EngineInitializer.java
@@ -56,6 +56,10 @@
     //Command line flag for strict mode
     private final static String STRICT_MODE = "enable-strict-mode";
 
+    // Command line flag for single-process mode.
+    // Must match the value of kSingleProcess in content_switches.cc
+    private static final String SINGLE_PROCESS = "single-process";
+
     private static boolean mInitializationStarted = false;
     private static boolean mSynchronousInitialization = false;
     private static boolean mInitializationCompleted = false;
@@ -277,9 +281,9 @@
                 }
 
                 Engine.loadNativeLibraries(mApplicationContext);
-
-                Engine.warmUpChildProcess(mApplicationContext);
-
+                if (!BrowserCommandLine.hasSwitch(SINGLE_PROCESS)) {
+                    Engine.warmUpChildProcess(mApplicationContext);
+                }
                 return true;
             }
             catch (Exception e)