Index: chrome/browser/apps/app_browsertest.cc |
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc |
index 595add90c9cc071e2b2929c90bd5c0755584a48c..e6f57290526a256fdd9d3f0cd001e5e91e4b7af0 100644 |
--- a/chrome/browser/apps/app_browsertest.cc |
+++ b/chrome/browser/apps/app_browsertest.cc |
@@ -1251,7 +1251,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 { |
@@ -1273,7 +1273,6 @@ class RestartDeviceTest : public PlatformAppBrowserTest { |
} |
virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { |
- chromeos::DBusThreadManager::Shutdown(); |
satorux1
2013/11/27 03:27:17
Is it ok to remove this? I thought FakeDBusThreadM
oshima
2013/11/27 07:41:54
Yes, this wasn't necessary because Shutdown is cal
|
PlatformAppBrowserTest::TearDownInProcessBrowserTestFixture(); |
} |