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

ash/system/chromeos/power/power_event_observer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/power/power_event_observer.h"
 
 #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"
 #include "ui/compositor/compositor.h"
 
 namespace ash {
 
 class PowerEventObserverTest : public test::AshTestBase {
  public:
   PowerEventObserverTest() {}
@@ skipping 22 matching lines @@
   }
 
   std::unique_ptr<PowerEventObserver> observer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PowerEventObserverTest);
 };
 
 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
   // that the system is about to suspend.
   SetCanLockScreen(true);
   SetShouldLockScreenBeforeSuspending(true);
   observer_->SuspendImminent();
   EXPECT_EQ(1, client->GetNumPendingSuspendReadinessCallbacks());
 
   // It should run the callback when it hears that the screen is locked and the
@@ skipping 67 matching lines @@
   // - The suspend request is canceled.
   // - Another suspend request is started.
   // - The screen lock animations complete.
   //
   // In this case, the observer should block the second suspend request until
   // the animations have completed.
   SetCanLockScreen(true);
   SetShouldLockScreenBeforeSuspending(true);
 
   chromeos::PowerManagerClient* client =
-      chromeos::DBusThreadManager::Get()->GetPowerManagerClient();
+      DBusThreadManagerAsh::Get()->GetPowerManagerClient();
   observer_->SuspendImminent();
   EXPECT_EQ(1, client->GetNumPendingSuspendReadinessCallbacks());
 
   observer_->ScreenIsLocked();
   observer_->SuspendDone(base::TimeDelta());
   observer_->SuspendImminent();
 
   // The expected number of suspend readiness callbacks is 2 because the
   // observer has not run the callback that it got from the first suspend
   // request.  The real PowerManagerClient would reset its internal counter in
   // this situation but the stub client is not that smart.
   EXPECT_EQ(2, client->GetNumPendingSuspendReadinessCallbacks());
 
   observer_->OnLockAnimationsComplete();
   EXPECT_EQ(1, client->GetNumPendingSuspendReadinessCallbacks());
   EXPECT_EQ(0, GetNumVisibleCompositors());
 }
 
 }  // namespace ash