Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/power/power_data_collector_unittest.cc

 // Copyright 2014 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_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"
 
 namespace chromeos {
 
 class PowerDataCollectorTest : public testing::Test {
  public:
   PowerDataCollectorTest() : power_data_collector_(NULL) {}
   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();
   }
 
   virtual void TearDown() OVERRIDE {
     PowerDataCollector::Shutdown();
     DBusThreadManager::Shutdown();
     power_data_collector_ = NULL;
   }
 
@@ skipping 47 matching lines @@
   AddSample(&sample_deque, sample1);
   ASSERT_EQ(static_cast<size_t>(1), sample_deque.size());
 
   AddSample(&sample_deque, sample2);
   ASSERT_EQ(static_cast<size_t>(1), sample_deque.size());
   EXPECT_EQ(sample2.time.ToInternalValue(),
             sample_deque[0].time.ToInternalValue());
 }
 
 }  // namespace chromeos