| Index: chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
|
| index c14d41d62feba11aa50552a809c9c9d54003fd66..1e6e8e974ae4a4ae3874c8280adc5b7311e4ce8b 100644
|
| --- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
|
| +++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
|
| @@ -40,7 +40,7 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest {
|
| FakeDBusThreadManager* fake_dbus_thread_manager =
|
| new FakeDBusThreadManager;
|
| fake_dbus_thread_manager->SetFakeClients();
|
| - DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
|
| + DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
|
| InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
|
| }
|
|
|
| @@ -54,7 +54,6 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest {
|
|
|
| virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
|
| InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
|
| - DBusThreadManager::Shutdown();
|
| }
|
|
|
| protected:
|
|
|