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

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

Issue 16196006: Move common default expectations for network library to CrosMock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 7 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/cros/cros_mock.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 47eacbe42204d7860503c3dc5039a3ee20b72cdb..a63b3b172bb8ad33114eec3b0194be982495faf3 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -11,7 +11,6 @@
#include "base/location.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/cros/cros_mock.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/helper.h"
@@ -123,8 +122,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
public testing::WithParamInterface<bool> {
protected:
ExistingUserControllerTest()
- : mock_network_library_(NULL),
- mock_login_display_(NULL),
+ : mock_login_display_(NULL),
mock_user_manager_(NULL),
testing_profile_(NULL) {
}
@@ -144,12 +142,6 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
cros_mock_->InitStatusAreaMocks();
cros_mock_->SetStatusAreaMocksExpectations();
- mock_network_library_ = cros_mock_->mock_network_library();
- EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
- .Times(AnyNumber());
-
mock_login_utils_ = new MockLoginUtils();
LoginUtils::Set(mock_login_utils_);
EXPECT_CALL(*mock_login_utils_, PrewarmAuthentication())
@@ -263,9 +255,6 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
scoped_ptr<ExistingUserController> existing_user_controller_;
- // These mocks are owned by CrosLibrary class.
- MockNetworkLibrary* mock_network_library_;
-
// |mock_login_display_| is owned by the ExistingUserController, which calls
// CreateLoginDisplay() on the |mock_login_display_host_| to get it.
MockLoginDisplay* mock_login_display_;
« no previous file with comments | « chrome/browser/chromeos/cros/cros_mock.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698