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

ash/system/chromeos/power/video_activity_notifier_unittest.cc

 // Copyright 2016 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/video_activity_notifier.h"
 
 #include <memory>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/video_detector.h"
 #include "base/macros.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 
 namespace ash {
 
 class VideoActivityNotifierTest : public test::AshTestBase {
  public:
   VideoActivityNotifierTest() {}
   ~VideoActivityNotifierTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     power_client_ = static_cast<chromeos::FakePowerManagerClient*>(
-        chromeos::DBusThreadManager::Get()->GetPowerManagerClient());
+        DBusThreadManagerAsh::Get()->GetPowerManagerClient());
     detector_.reset(new VideoDetector());
     notifier_.reset(new VideoActivityNotifier(detector_.get()));
   }
 
   void TearDown() override {
     notifier_.reset();
     detector_.reset();
     test::AshTestBase::TearDown();
   }
 
@@ skipping 68 matching lines @@
   EXPECT_TRUE(power_client_->PopVideoActivityReport());
   EXPECT_FALSE(power_client_->have_video_activity_report());
 
   // The timer should stop when video video.
   notifier_->OnVideoStateChanged(VideoDetector::State::NOT_PLAYING);
   EXPECT_FALSE(notifier_->TriggerTimeoutForTest());
   EXPECT_FALSE(power_client_->have_video_activity_report());
 }
 
 }  // namespace ash