mash: Allow a subset of D-Bus clients to be created in DBusThreadManager

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/common/material_design/material_design_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 10 matching lines @@
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/events/event.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/surface_context_factory.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "chromeos/audio/cras_audio_handler.h"
+#include "chromeos/dbus/dbus_client_bundle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"  // nogncheck
 #endif
 
 namespace ash {
 namespace mus {
 namespace {
 
 void InitializeComponents() {
   message_center::MessageCenter::Initialize();
 #if defined(OS_CHROMEOS)
+  // TODO(crbug.com/629707): Use mojo API for bluetooth and shill.
+  const chromeos::DBusClientTypeMask clients =
+      chromeos::DBusClientBundle::BLUETOOTH | chromeos::DBusClientBundle::CRAS |
+      chromeos::DBusClientBundle::GSM_SMS |
+      chromeos::DBusClientBundle::POWER_MANAGER |
+      chromeos::DBusClientBundle::SESSION_MANAGER |
+      chromeos::DBusClientBundle::SHILL | chromeos::DBusClientBundle::SMS |
+      chromeos::DBusClientBundle::SYSTEM_CLOCK |
+      chromeos::DBusClientBundle::UPDATE_ENGINE;
   // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
   // before WindowManager::Init().
-  chromeos::DBusThreadManager::Initialize();
+  chromeos::DBusThreadManager::Initialize(clients);
+  //JAMES leak
+  new DBusThreadManagerAsh();
 
   // See ChromeBrowserMainPartsChromeos for ordering details.
   bluez::BluezDBusManager::Initialize(
       chromeos::DBusThreadManager::Get()->GetSystemBus(),
-      chromeos::DBusThreadManager::Get()->IsUsingStub(
+      chromeos::DBusThreadManager::Get()->IsUsingFake(
           chromeos::DBusClientBundle::BLUETOOTH));
   // TODO(jamescook): Initialize real audio handler.
   chromeos::CrasAudioHandler::InitializeForTesting();
   PowerStatus::Initialize();
 #endif
 }
 
 void ShutdownComponents() {
 #if defined(OS_CHROMEOS)
   PowerStatus::Shutdown();
@@ skipping 125 matching lines @@
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash