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 cbcc7eb60953a777981a356927c04039576f3a85..db1638722b8abdd2ddfaaf286619a0b58e886d86 100644 |
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc |
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
@@ -51,6 +51,7 @@ |
#include "chromeos/disks/disk_mount_manager.h" |
#include "chromeos/disks/mock_disk_mount_manager.h" |
#include "chromeos/login/login_state.h" |
+#include "chromeos/network/network_handler.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/test/test_browser_thread.h" |
#include "content/public/test/test_utils.h" |
@@ -216,6 +217,8 @@ class LoginUtilsTest : public testing::Test, |
CryptohomeLibrary::Initialize(); |
LoginState::Initialize(); |
ConnectivityStateHelper::SetForTest(&mock_connectivity_state_helper_); |
+ EXPECT_CALL(mock_connectivity_state_helper_, DefaultNetworkOnline()) |
+ .WillRepeatedly(Return(false)); |
mock_input_method_manager_ = new input_method::MockInputMethodManager(); |
input_method::InitializeForTesting(mock_input_method_manager_); |
@@ -276,6 +279,10 @@ class LoginUtilsTest : public testing::Test, |
connector_->Init(local_state_.Get(), |
browser_process_->system_request_context()); |
+ // IOThread creates ProxyConfigServiceImpl which in turn needs |
+ // NetworkHandler. Thus initialize it here before creating IOThread. |
+ NetworkHandler::Initialize(); |
+ |
io_thread_state_.reset(new IOThread(local_state_.Get(), |
browser_process_->policy_service(), |
NULL, NULL)); |