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

content/public/common/content_switches.cc

 // Copyright (c) 2012 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.
 
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 
 namespace switches {
 
 // The number of MSAA samples for canvas2D. Requires MSAA support by GPU to
@@ skipping 854 matching lines @@
 const char kUtilityProcessRunningElevated[] = "utility-run-elevated";
 
 // In debug builds, asserts that the stream of input events is valid.
 const char kValidateInputEventStream[] = "validate-input-event-stream";
 
 // Will add kWaitForDebugger to every child processes. If a value is passed, it
 // will be used as a filter to determine if the child process should have the
 // 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";
 
 // Causes the process to run as a renderer zygote.
 const char kZygoteProcess[]                 = "zygote";
 
 #if defined(ENABLE_WEBRTC)
 // Disables HW decode acceleration for WebRTC.
 const char kDisableWebRtcHWDecoding[]       = "disable-webrtc-hw-decoding";
 
@@ skipping 156 matching lines @@
 const char kMemoryPressureThresholdsMb[] = "memory-pressure-thresholds-mb";
 
 // Enables the exporting of the tracing events to ETW. This is only supported on
 // Windows Vista and later.
 const char kTraceExportEventsToETW[] = "trace-export-events-to-etw";
 #endif
 
 // Don't dump stuff here, follow the same order as the header.
 
 }  // namespace switches