mustash chrome: Change how mus connection is set up in chrome.

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index d7a1f3958a4ac9896d8f6c0289a611d7b7a2bd97..ff8b007a40d94764975265b80de3af6368184a7b 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -277,16 +277,6 @@ static void SetUpGLibLogHandler() {
 }
 #endif  // defined(USE_GLIB)
 
-#if defined(USE_AURA)
-void WaitForMojoShellInitialize() {
-  // TODO(rockot): Remove this. http://crbug.com/594852.
-  base::RunLoop wait_loop;
-  MojoShellConnection::GetForProcess()->SetInitializeHandler(
-      wait_loop.QuitClosure());
-  wait_loop.Run();
-}
-#endif  // defined(USE_AURA)
-
 void OnStoppedStartupTracing(const base::FilePath& trace_file) {
   VLOG(0) << "Completed startup tracing to " << trace_file.value();
 }
@@ -1197,12 +1187,9 @@ int BrowserMainLoop::BrowserThreadsStarted() {
 
   mojo_shell_context_.reset(new MojoShellContext);
 #if defined(USE_AURA)
-  // TODO(rockot): Remove the blocking wait for init.
-  // http://crbug.com/594852.
-  if (shell::ShellIsRemote() && MojoShellConnection::GetForProcess()) {
+  if (shell::ShellIsRemote()) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kIsRunningInMash);
-    WaitForMojoShellInitialize();
   }
 #endif