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

ash/mus/window_manager_application.cc

Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 614722a09855dfa1c52b67590b40248fdbe1bb0c..18acc483fa07bcff1dbbfc43f35aa50519018612 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -28,8 +28,10 @@
 #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
@@ -42,14 +44,25 @@ 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();