| Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
|
| index a56d55e7fd43fe2e55d088d43bf7c37f39f43f33..b3aefe70e95a4da9abd9bb88a5ed5d9472d9b4d7 100644
|
| --- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
|
| @@ -49,7 +49,7 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
|
| fake_dbus_thread_manager->SetUpdateEngineClient(
|
| scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
|
|
|
| - DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
|
| + DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
|
| WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
|
|
|
| // Setup network portal detector to return online state for both
|
| @@ -90,7 +90,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
|
| virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
|
| NetworkPortalDetector::Shutdown();
|
| WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
|
| - DBusThreadManager::Shutdown();
|
| }
|
|
|
| void SetDefaultNetworkPath(const std::string& service_path) {
|
|
|