content: Let embedders know when MojoShellConnection is initialized.

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 259 matching lines @@
                                                   G_LOG_FLAG_FATAL |
                                                   G_LOG_LEVEL_ERROR |
                                                   G_LOG_LEVEL_CRITICAL |
                                                   G_LOG_LEVEL_WARNING),
                       GLibLogHandler,
                       NULL);
   }
 }
 #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();
 }
 
 // Disable optimizations for this block of functions so the compiler doesn't
 // merge them all together. This makes it possible to tell what thread was
 // unresponsive by inspecting the callstack.
 MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
 
@@ skipping 872 matching lines @@
   base::PlatformThread::SetName("CrBrowserMain");
 
   // Register the main thread by instantiating it, but don't call any methods.
   main_thread_.reset(
       new BrowserThreadImpl(BrowserThread::UI, base::MessageLoop::current()));
 }
 
 int BrowserMainLoop::BrowserThreadsStarted() {
   TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted");
 
-  // Bring up Mojo IPC and shell as early as possible.
+  // Bring up Mojo IPC and shell as early as possible. Initializaing mojo
+  // requires the IO thread to have been initialized first. So this cannot
+  // happen any earlier than this.
+  InitializeMojo();
 
-  if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
-    // Disallow mojo sync calls in the browser process. Note that we allow sync
-    // calls in single-process mode since renderer IPCs are made from a browser
-    // thread.
-    bool sync_call_allowed = false;
-    MojoResult result = mojo::edk::SetProperty(
-        MOJO_PROPERTY_TYPE_SYNC_CALL_ALLOWED, &sync_call_allowed);
-    DCHECK_EQ(MOJO_RESULT_OK, result);
-  }
-
-  mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport(
-      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
-          ->task_runner()));
-
-  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
 
-#if defined(OS_MACOSX)
-  mojo::edk::SetMachPortProvider(MachBroker::GetInstance());
-#endif  // defined(OS_MACOSX)
-
   indexed_db_thread_.reset(new base::Thread("IndexedDB"));
   indexed_db_thread_->Start();
 
   HistogramSynchronizer::GetInstance();
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   // Up the priority of the UI thread.
   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
 #endif
 
 #if defined(ENABLE_VULKAN)
@@ skipping 194 matching lines @@
   if (parameters_.ui_task) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   *parameters_.ui_task);
   }
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
+void BrowserMainLoop::InitializeMojo() {
+  if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
+    // Disallow mojo sync calls in the browser process. Note that we allow sync
+    // calls in single-process mode since renderer IPCs are made from a browser
+    // thread.
+    bool sync_call_allowed = false;
+    MojoResult result = mojo::edk::SetProperty(
+        MOJO_PROPERTY_TYPE_SYNC_CALL_ALLOWED, &sync_call_allowed);
+    DCHECK_EQ(MOJO_RESULT_OK, result);
+  }
+
+  mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport(
+      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
+          ->task_runner()));
+
+  mojo_shell_context_.reset(new MojoShellContext);
+#if defined(OS_MACOSX)
+  mojo::edk::SetMachPortProvider(MachBroker::GetInstance());
+#endif  // defined(OS_MACOSX)
+  if (parts_)
+    parts_->MojoShellConnectionStarted(MojoShellConnection::GetForProcess());
+}
+
 base::FilePath BrowserMainLoop::GetStartupTraceFileName(
     const base::CommandLine& command_line) const {
   base::FilePath trace_file;
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     trace_file = command_line.GetSwitchValuePath(
         switches::kTraceStartupFile);
     // trace_file = "none" means that startup events will show up for the next
     // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/
     // EndTracing, for example).
     if (trace_file == base::FilePath().AppendASCII("none"))
@@ skipping 77 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
         audio_thread_->task_runner();
     audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
                                                  std::move(worker_task_runner),
                                                  MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content