| Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| index 465b33e9775b97bee63e8f314226f1d670baeb8d..4abf5b85337bddc445740ca51d30dffbd9995f18 100644
|
| --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| @@ -204,7 +204,7 @@ class LoginUtilsTest : public testing::Test,
|
| // DBusThreadManager should be initialized before io_thread_state_, as
|
| // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,
|
| // which is part of io_thread_state_.
|
| - DBusThreadManager::InitializeForTesting(&fake_dbus_thread_manager_);
|
| + DBusThreadManager::InitializeWithStub();
|
|
|
| SystemSaltGetter::Initialize();
|
| LoginState::Initialize();
|
| @@ -467,7 +467,6 @@ class LoginUtilsTest : public testing::Test,
|
| scoped_ptr<content::TestBrowserThread> io_thread_;
|
| scoped_ptr<IOThread> io_thread_state_;
|
|
|
| - FakeDBusThreadManager fake_dbus_thread_manager_;
|
| input_method::MockInputMethodManager* mock_input_method_manager_;
|
| disks::MockDiskMountManager mock_disk_mount_manager_;
|
| net::TestURLFetcherFactory test_url_fetcher_factory_;
|
| @@ -478,7 +477,6 @@ class LoginUtilsTest : public testing::Test,
|
|
|
| policy::BrowserPolicyConnector* connector_;
|
|
|
| - // Initialized after |fake_dbus_thread_manager_| is set up.
|
| scoped_ptr<ScopedTestDeviceSettingsService> test_device_settings_service_;
|
| scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;
|
| scoped_ptr<ScopedTestUserManager> test_user_manager_;
|
|
|