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

ash/wm/power_button_controller.cc

Index: ash/wm/power_button_controller.cc
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index b4c5916a3df6cb401d3e48b6d728fe36ac97f1fc..431c38aca972a98a17e57f2b78517a1a986226b4 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/power_button_controller.h"
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
@@ -23,7 +24,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"
 #endif
 
 namespace ash {
@@ -48,7 +49,7 @@ PowerButtonController::PowerButtonController(LockStateController* controller)
 #endif
       controller_(controller) {
 #if defined(OS_CHROMEOS)
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(
       this);
   Shell::GetInstance()->display_configurator()->AddObserver(this);
 #endif
@@ -59,7 +60,7 @@ PowerButtonController::~PowerButtonController() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_configurator()->RemoveObserver(this);
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 #endif
 }