Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.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/peripheral_battery_observer.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 namespace {
 
 const char kTestBatteryPath[] = "/sys/class/power_supply/hid-AA:BB:CC-battery";
 const char kTestBatteryAddress[] = "cc:bb:aa";
 const char kTestDeviceName[] = "test device";
 
 }  // namespace
 
 namespace chromeos {
 
 class PeripheralBatteryObserverTest : public InProcessBrowserTest {
  public:
   PeripheralBatteryObserverTest() {}
   virtual ~PeripheralBatteryObserverTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    FakeDBusThreadManager* fake_dbus_thread_manager =
-        new FakeDBusThreadManager;
-    fake_dbus_thread_manager->SetFakeClients();
-    DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
+    chromeos::DBusThreadManager::Initialize();
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     observer_.reset(new PeripheralBatteryObserver());
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
     observer_.reset();
   }
@@ skipping 95 matching lines @@
   observer_->PeripheralBatteryStatusReceived(kTestBatteryPath,
                                              kTestDeviceName, 5);
   EXPECT_EQ(observer_->batteries_.count(kTestBatteryAddress), 1u);
   EXPECT_TRUE(notification_manager->FindById(kTestBatteryAddress) != NULL);
 
   observer_->RemoveBattery(kTestBatteryAddress);
   EXPECT_FALSE(notification_manager->FindById(kTestBatteryAddress) != NULL);
 }
 
 }  // namespace chromeos