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

ash/system/chromeos/power/power_event_observer.cc

Index: ash/system/chromeos/power/power_event_observer.cc
diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc
index 663a8a613876b67e12d9c7bb4aae4bf5a22c3336..11e638147f8de8460c1e8c3137eeef05880f6e69 100644
--- a/ash/system/chromeos/power/power_event_observer.cc
+++ b/ash/system/chromeos/power/power_event_observer.cc
@@ -4,12 +4,13 @@
 
 #include "ash/system/chromeos/power/power_event_observer.h"
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wm/power_button_controller.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/user_activity/user_activity_detector.h"
@@ -45,16 +46,16 @@ void OnSuspendDisplaysCompleted(const base::Closure& suspend_callback,
 
 PowerEventObserver::PowerEventObserver()
     : screen_locked_(false), waiting_for_lock_screen_animations_(false) {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(
       this);
-  chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(
+  DBusThreadManagerAsh::Get()->GetSessionManagerClient()->AddObserver(
       this);
 }
 
 PowerEventObserver::~PowerEventObserver() {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
-  chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(
+  DBusThreadManagerAsh::Get()->GetSessionManagerClient()->RemoveObserver(
       this);
 }
 
@@ -93,11 +94,11 @@ void PowerEventObserver::SuspendImminent() {
   // is unblocked from OnLockAnimationsComplete().
   if (!screen_locked_ && delegate->ShouldLockScreenBeforeSuspending() &&
       delegate->CanLockScreen()) {
-    screen_lock_callback_ = chromeos::DBusThreadManager::Get()
+    screen_lock_callback_ = DBusThreadManagerAsh::Get()
                                 ->GetPowerManagerClient()
                                 ->GetSuspendReadinessCallback();
     VLOG(1) << "Requesting screen lock from PowerEventObserver";
-    chromeos::DBusThreadManager::Get()
+    DBusThreadManagerAsh::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
   } else if (waiting_for_lock_screen_animations_) {
@@ -108,7 +109,7 @@ void PowerEventObserver::SuspendImminent() {
     // started.  In practice, it is highly unlikely that this will ever happen
     // but it's better to be safe since the cost of not dealing with it properly
     // is a memory leak in the GPU and weird artifacts on the screen.
-    screen_lock_callback_ = chromeos::DBusThreadManager::Get()
+    screen_lock_callback_ = DBusThreadManagerAsh::Get()
                                 ->GetPowerManagerClient()
                                 ->GetSuspendReadinessCallback();
   } else {
@@ -119,7 +120,7 @@ void PowerEventObserver::SuspendImminent() {
 
   ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
   Shell::GetInstance()->display_configurator()->SuspendDisplays(base::Bind(
-      &OnSuspendDisplaysCompleted, chromeos::DBusThreadManager::Get()
+      &OnSuspendDisplaysCompleted, DBusThreadManagerAsh::Get()
                                        ->GetPowerManagerClient()
                                        ->GetSuspendReadinessCallback()));
 }