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

ash/sysui/sysui_application.cc

Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index dcd65f2259fc652549afb2627b4f13af5f019164..994a5c0a191dec11dcc4ee62f606030152c33f5d 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/login_status.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_window_ids.h"
@@ -48,7 +49,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #endif
 
@@ -291,8 +292,8 @@ class AshInit {
 #if defined(OS_CHROMEOS)
     chromeos::DBusThreadManager::Initialize();
     bluez::BluezDBusManager::Initialize(
-        chromeos::DBusThreadManager::Get()->GetSystemBus(),
-        chromeos::DBusThreadManager::Get()->IsUsingStub(
+        DBusThreadManagerAsh::Get()->GetSystemBus(),
+        DBusThreadManagerAsh::Get()->IsUsingStub(
             chromeos::DBusClientBundle::BLUETOOTH));
     chromeos::CrasAudioHandler::InitializeForTesting();
 #endif