Reinstate wait-for-Initialize when Chrome is run in Mash

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 375ab6b0fe9ce26b0c97a3ef8b21f8f0e94e0e78..b02e629bad496afd77ad8d769548ac00eb0e7cbe 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -872,6 +872,12 @@ const char kValidateInputEventStream[] = "validate-input-event-stream";
 // kWaitForDebugger flag passed on or not.
 const char kWaitForDebuggerChildren[]       = "wait-for-debugger-children";
 
+// Forces processes to wait for Mojo shell connection initialization before
+// proceeding with main thread startup.
+//
+// TODO(rockot): Remove this. http://crbug.com/594852.
+const char kWaitForMojoShell[]              = "wait-for-mojo-shell";
+
 // The prefix used when starting the zygote process. (i.e. 'gdb --args')
 const char kZygoteCmdPrefix[]               = "zygote-cmd-prefix";