diff options
Diffstat (limited to 'chrome/browser/apps/app_browsertest.cc')
-rw-r--r-- | chrome/browser/apps/app_browsertest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 39356b5..f2c1ab5 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(); } |