Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/dbus/power_policy_controller_unittest.cc

 // Copyright (c) 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 "chromeos/dbus/power_policy_controller.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::SaveArg;
 
 namespace chromeos {
 
 class PowerPolicyControllerTest : public testing::Test {
  public:
   PowerPolicyControllerTest() {}
   virtual ~PowerPolicyControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
-    dbus_manager_ = new FakeDBusThreadManager;
+    scoped_ptr<DBusThreadManagerTestHelper> dbus_helper =
+        chromeos::DBusThreadManager::InitializeForTesting();
     fake_power_client_ = new FakePowerManagerClient;
-    dbus_manager_->SetPowerManagerClient(
+    dbus_helper->SetPowerManagerClient(
         scoped_ptr<PowerManagerClient>(fake_power_client_));
-    DBusThreadManager::InitializeForTesting(dbus_manager_);  // Takes ownership.
 
     policy_controller_.reset(new PowerPolicyController);
-    policy_controller_->Init(dbus_manager_);
+    policy_controller_->Init(DBusThreadManager::Get());
   }
 
   virtual void TearDown() OVERRIDE {
     policy_controller_.reset();
     DBusThreadManager::Shutdown();
   }
 
  protected:
-  FakeDBusThreadManager* dbus_manager_;  // Not owned.
   FakePowerManagerClient* fake_power_client_;
   scoped_ptr<PowerPolicyController> policy_controller_;
 };
 
 TEST_F(PowerPolicyControllerTest, Prefs) {
   PowerPolicyController::PrefValues prefs;
   prefs.ac_screen_dim_delay_ms = 600000;
   prefs.ac_screen_off_delay_ms = 660000;
   prefs.ac_idle_delay_ms = 720000;
   prefs.battery_screen_dim_delay_ms = 300000;
@@ skipping 156 matching lines @@
 
 TEST_F(PowerPolicyControllerTest, AvoidSendingEmptyPolicies) {
   // Check that empty policies aren't sent when PowerPolicyController is created
   // or destroyed.
   EXPECT_EQ(0, fake_power_client_->num_set_policy_calls());
   policy_controller_.reset();
   EXPECT_EQ(0, fake_power_client_->num_set_policy_calls());
 }
 
 }  // namespace chromeos