| Index: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
|
| index e06fc9f99ff7226e58c0cbbbb04f28aa9d1c60d7..a77d14cfeea4ca4f7651dc74afd3f72c626ec3dc 100644
|
| --- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
|
| @@ -58,7 +58,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
|
| fake_session_manager_client_ = new FakeSessionManagerClient;
|
| fake_dbus_thread_manager->SetSessionManagerClient(
|
| scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
|
| - DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
|
| + DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
|
| }
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| @@ -80,7 +80,6 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
|
|
|
| virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
|
| InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
|
| - DBusThreadManager::Shutdown();
|
| }
|
|
|
| void EmulateContinueButtonExit(NetworkScreen* network_screen) {
|
|
|