Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 22264004: Remove ConnectivityStateHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove redundant IsConnected() check Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/oauth2_login_verifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 60923be0ac5500496db37295f1d9e59d4f7cadb4..0b9d798b9edc3e4b94c76052ff23033fcf17af91 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -23,8 +23,6 @@
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/login_status_consumer.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
-#include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h"
#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ -217,9 +215,6 @@ 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_);
@@ -314,7 +309,6 @@ class LoginUtilsTest : public testing::Test,
LoginUtils::Set(NULL);
input_method::Shutdown();
- ConnectivityStateHelper::SetForTest(NULL);
LoginState::Shutdown();
CryptohomeLibrary::Shutdown();
@@ -529,7 +523,6 @@ class LoginUtilsTest : public testing::Test,
input_method::MockInputMethodManager* mock_input_method_manager_;
disks::MockDiskMountManager mock_disk_mount_manager_;
net::TestURLFetcherFactory test_url_fetcher_factory_;
- MockConnectivityStateHelper mock_connectivity_state_helper_;
cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/oauth2_login_verifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698