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

ash/common/system/chromeos/power/power_status.cc

Index: ash/common/system/chromeos/power/power_status.cc
diff --git a/ash/common/system/chromeos/power/power_status.cc b/ash/common/system/chromeos/power/power_status.cc
index 1966398738f1f3ebcb6d1493d913a984334c8785..97f0103ea2b1c7291aa57b3c8010bfbc84c5a4eb 100644
--- a/ash/common/system/chromeos/power/power_status.cc
+++ b/ash/common/system/chromeos/power/power_status.cc
@@ -7,12 +7,13 @@
 #include <algorithm>
 #include <cmath>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
@@ -226,13 +227,13 @@ void PowerStatus::RemoveObserver(Observer* observer) {
 }
 
 void PowerStatus::RequestStatusUpdate() {
-  chromeos::DBusThreadManager::Get()
+  DBusThreadManagerAsh::Get()
       ->GetPowerManagerClient()
       ->RequestStatusUpdate();
 }
 
 void PowerStatus::SetPowerSource(const std::string& id) {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->SetPowerSource(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->SetPowerSource(
       id);
 }
 
@@ -489,15 +490,15 @@ base::string16 PowerStatus::GetAccessibleNameString(
 }
 
 PowerStatus::PowerStatus() {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(
       this);
-  chromeos::DBusThreadManager::Get()
+  DBusThreadManagerAsh::Get()
       ->GetPowerManagerClient()
       ->RequestStatusUpdate();
 }
 
 PowerStatus::~PowerStatus() {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 }