mus: Initialize WindowManagerConnection in chrome instead of in content.

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 168 matching lines @@
 #include "ui/base/x/x11_util_internal.h"  // nogncheck
 #include "ui/gfx/x/x11_connection.h"  // nogncheck
 #include "ui/gfx/x/x11_switches.h"  // nogncheck
 #include "ui/gfx/x/x11_types.h"  // nogncheck
 #endif
 
 #if defined(USE_NSS_CERTS)
 #include "crypto/nss_util.h"
 #endif
 
-#if defined(MOJO_SHELL_CLIENT)
-#include "services/shell/public/cpp/connector.h"
-#include "ui/views/mus/window_manager_connection.h"
-#endif
-
 #if defined(ENABLE_VULKAN)
 #include "gpu/vulkan/vulkan_implementation.h"
 #endif
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 namespace content {
@@ skipping 1000 matching lines @@
   if (IsRunningInMojoShell()) {
     if (!MojoShellConnectionImpl::CreateUsingFactory()) {
       mojo::edk::SetParentPipeHandleFromCommandLine();
       MojoShellConnectionImpl::Create();
       MojoShellConnectionImpl::Get()->BindToRequestFromCommandLine();
     }
   }
   mojo_shell_context_.reset(new MojoShellContext);
   if (IsRunningInMojoShell()) {
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+    // TODO(rockot): Remove the blocking wait for init.
+    // http://crbug.com/594852.
     MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get();
-    if (mojo_shell_connection) {
-      // TODO(rockot): Remove the blocking wait for init.
-      // http://crbug.com/594852.
+    if (mojo_shell_connection)
       WaitForMojoShellInitialize();
-      views::WindowManagerConnection::Create(
-          mojo_shell_connection->GetConnector(),
-          mojo_shell_connection->GetIdentity());
-    }
 #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();
 
@@ skipping 315 matching lines @@
                                                  std::move(worker_task_runner),
                                                  MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 
   if (use_hang_monitor)
     media::AudioManager::StartHangMonitor(io_thread_->task_runner());
 }
 
 }  // namespace content