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

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

Issue 14069017: Move *UserLoggedIn methods from UserManager to UserManagerImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit addressed. Created 7 years, 8 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
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 ed25f6a2a8dac2cc87ac579a83c8148a277fc8d4..8d06a0d86d10d40aa3733759e2c86a716c8a63bd 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -66,7 +66,6 @@
using ::testing::_;
using ::testing::AnyNumber;
-using ::testing::AnyOf;
using ::testing::Invoke;
using ::testing::InvokeWithoutArgs;
using ::testing::Return;
@@ -398,14 +397,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
EXPECT_CALL(*mock_login_display_host_,
StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
.Times(0);
- // This will be the first sign-in of a new user, which may cause the (legacy)
- // registration to be activated. A real WizardController instance immediately
- // advances to the Terms of Service or user image screen but this test uses
- // MockLoginDisplayHost Instead.
EXPECT_CALL(*mock_login_display_host_,
- StartWizard(AnyOf(WizardController::kRegistrationScreenName,
- WizardController::kTermsOfServiceScreenName),
- NULL))
+ StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
.Times(1);
EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
.Times(1)
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698