Initialize DBus in mojo:ash on chrome os

ash/mus/window_manager_application.cc

 // Copyright 2015 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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mus/accelerator_registrar_impl.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/shelf_layout_impl.h"
 #include "ash/mus/user_window_controller_impl.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/common/gpu_service.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/events/event.h"
 #include "ui/views/mus/aura_init.h"
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_thread_manager.h"
+#endif
+
 namespace ash {
 namespace mus {
 
 WindowManagerApplication::WindowManagerApplication()
-    : connector_(nullptr), screenlock_state_listener_binding_(this) {}
+    : connector_(nullptr), screenlock_state_listener_binding_(this) {
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Initialize();

[James Cook, 2016/07/01 23:17:36]

I put this here instead of in WMA::Initialize() because WmTestHelper doesn't
call WMA::Initialize().

+#endif
+}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
   // it early on.
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars(
       accelerator_registrars_);
   for (AcceleratorRegistrarImpl* registrar : accelerator_registrars)
     registrar->Destroy();
 
   // Destroy the WindowManager while still valid. This way we ensure
   // OnWillDestroyRootWindowController() is called (if it hasn't been already).
   window_manager_.reset();
+
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Shutdown();
+#endif
 }
 
 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::InitWindowManager(
     ::mus::WindowTreeClient* window_tree_client) {
   window_manager_->Init(window_tree_client);
@@ skipping 107 matching lines @@
     RootWindowController* controller) {
   // TODO(msw): this isn't right, ownership should belong in WindowManager
   // and/or RootWindowController. But this is temporary until we get rid of
   // sysui.
   shelf_layout_.reset();
   user_window_controller_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash