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

ash/system/chromeos/power/power_event_observer_unittest.cc

Index: ash/system/chromeos/power/power_event_observer_unittest.cc
diff --git a/ash/system/chromeos/power/power_event_observer_unittest.cc b/ash/system/chromeos/power/power_event_observer_unittest.cc
index 15c9c6a970f4b4dceaac05fe0b21b8ede591f04f..b07124f8c4f7a50708dab056c2a885b6ffe7d0de 100644
--- a/ash/system/chromeos/power/power_event_observer_unittest.cc
+++ b/ash/system/chromeos/power/power_event_observer_unittest.cc
@@ -6,10 +6,11 @@
 
 #include <memory>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/time/time.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ -52,7 +53,7 @@ class PowerEventObserverTest : public test::AshTestBase {
 
 TEST_F(PowerEventObserverTest, LockBeforeSuspend) {
   chromeos::PowerManagerClient* client =
-      chromeos::DBusThreadManager::Get()->GetPowerManagerClient();
+      DBusThreadManagerAsh::Get()->GetPowerManagerClient();
   ASSERT_EQ(0, client->GetNumPendingSuspendReadinessCallbacks());
 
   // Check that the observer requests a suspend-readiness callback when it hears
@@ -140,7 +141,7 @@ TEST_F(PowerEventObserverTest, DelayResuspendForLockAnimations) {
   SetShouldLockScreenBeforeSuspending(true);
 
   chromeos::PowerManagerClient* client =
-      chromeos::DBusThreadManager::Get()->GetPowerManagerClient();
+      DBusThreadManagerAsh::Get()->GetPowerManagerClient();
   observer_->SuspendImminent();
   EXPECT_EQ(1, client->GetNumPendingSuspendReadinessCallbacks());