Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/power/power_prefs_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 "chrome/browser/chromeos/power/power_prefs.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/power_manager/policy.pb.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class PowerPrefsTest : public testing::Test {
  protected:
   PowerPrefsTest();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   const Profile* GetProfile() const;
 
   std::string GetExpectedPowerPolicyForProfile(Profile* profile) const;
   std::string GetCurrentPowerPolicy() const;
   bool GetExpectedAllowScreenWakeLocksForProfile(Profile* profile) const;
   bool GetCurrentAllowScreenWakeLocks() const;
 
   TestingProfileManager profile_manager_;
-  FakeDBusThreadManager fake_dbus_thread_manager_;
   PowerPolicyController* power_policy_controller_;     // Not owned.
   FakePowerManagerClient* fake_power_manager_client_;  // Not owned.
 
   scoped_ptr<PowerPrefs> power_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPrefsTest);
 };
 
 PowerPrefsTest::PowerPrefsTest()
     : profile_manager_(TestingBrowserProcess::GetGlobal()),
       power_policy_controller_(new PowerPolicyController),
       fake_power_manager_client_(new FakePowerManagerClient) {
-  fake_dbus_thread_manager_.SetPowerManagerClient(
-      scoped_ptr<PowerManagerClient>(fake_power_manager_client_));
-  fake_dbus_thread_manager_.SetPowerPolicyController(
-      scoped_ptr<PowerPolicyController>(power_policy_controller_));
-  power_policy_controller_->Init(&fake_dbus_thread_manager_);
 }
 
 void PowerPrefsTest::SetUp() {
   testing::Test::SetUp();
+
+  scoped_ptr<DBusThreadManagerTestHelper> dbus_helper =
+      chromeos::DBusThreadManager::InitializeForTesting();
+  dbus_helper->SetPowerManagerClient(
+      scoped_ptr<PowerManagerClient>(fake_power_manager_client_));
+  dbus_helper->SetPowerPolicyController(
+      scoped_ptr<PowerPolicyController>(power_policy_controller_));
+  power_policy_controller_->Init(chromeos::DBusThreadManager::Get());
+
   ASSERT_TRUE(profile_manager_.SetUp());
 
   power_prefs_.reset(new PowerPrefs(power_policy_controller_));
   EXPECT_FALSE(GetProfile());
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(
                 power_manager::PowerManagementPolicy()),
             GetCurrentPowerPolicy());
 }
 
 void PowerPrefsTest::TearDown() {
@@ skipping 173 matching lines @@
                         content::Source<Profile>(user_profile),
                         content::NotificationService::NoDetails());
 
   // The user profile's prefs should still be used.
   EXPECT_FALSE(GetProfile());
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(user_profile),
             GetCurrentPowerPolicy());
 }
 
 }  // namespace chromeos