| Index: chrome/browser/apps/app_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
|
| index 39356b58fedc70e5356f18ba6193e6ab99ef5144..f2c1ab522bb8ccce46bd7c3c1076c6acfe7d19f3 100644
|
| --- a/chrome/browser/apps/app_browsertest.cc
|
| +++ b/chrome/browser/apps/app_browsertest.cc
|
| @@ -1235,7 +1235,7 @@ class RestartDeviceTest : public PlatformAppBrowserTest {
|
| power_manager_client_ = new chromeos::FakePowerManagerClient;
|
| dbus_manager->SetPowerManagerClient(
|
| scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
|
| - chromeos::DBusThreadManager::InitializeForTesting(dbus_manager);
|
| + chromeos::DBusThreadManager::SetInstanceForTesting(dbus_manager);
|
| }
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| @@ -1257,7 +1257,6 @@ class RestartDeviceTest : public PlatformAppBrowserTest {
|
| }
|
|
|
| virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
|
| - chromeos::DBusThreadManager::Shutdown();
|
| PlatformAppBrowserTest::TearDownInProcessBrowserTestFixture();
|
| }
|
|
|
|
|