Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/power/power_data_collector_unittest.cc

Index: chrome/browser/chromeos/power/power_data_collector_unittest.cc
diff --git a/chrome/browser/chromeos/power/power_data_collector_unittest.cc b/chrome/browser/chromeos/power/power_data_collector_unittest.cc
index 821d1d467d8e3f19bb1c75f5550b004ffad2a1b7..db2df82eb94b6e571af6840e6183f50a6ccef877 100644
--- a/chrome/browser/chromeos/power/power_data_collector_unittest.cc
+++ b/chrome/browser/chromeos/power/power_data_collector_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/power/power_data_collector.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -16,9 +15,7 @@ class PowerDataCollectorTest : public testing::Test {
   virtual ~PowerDataCollectorTest() {}
 
   virtual void SetUp() OVERRIDE {
-    FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
-    fake_dbus_thread_manager->SetFakeClients();
-    DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
+    DBusThreadManager::Initialize();
     PowerDataCollector::InitializeForTesting();
     power_data_collector_ = PowerDataCollector::Get();
   }