Hook embedded shell up to MojoShellConnection

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 8f6909b77627650af6b10479f3072ec5c2eb11fb..9e3c4be79596b49432a3d826570918a95c771c54 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -915,16 +915,14 @@ int BrowserMainLoop::CreateThreads() {
 }
 
 int BrowserMainLoop::PreMainMessageLoopRun() {
-#if defined(MOJO_SHELL_CLIENT)
   if (IsRunningInMojoShell()) {
     MojoShellConnectionImpl::Create();
     MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();
-#if defined(USE_AURA)
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
     views::WindowManagerConnection::Create(
         MojoShellConnection::Get()->GetShell());
 #endif
   }
-#endif
 
   if (parts_) {
     TRACE_EVENT0("startup",
@@ -1193,7 +1191,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
           ->task_runner()));
   mojo_shell_context_.reset(new MojoShellContext);
-#endif
+#endif  // !defined(OS_IOS)
 
 #if !defined(OS_IOS)
   indexed_db_thread_.reset(new base::Thread("IndexedDB"));