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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Issue 10825085: Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
10 #include "chrome/browser/chromeos/cros/cros_mock.h" 10 #include "chrome/browser/chromeos/cros/cros_mock.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 .Times(1); 263 .Times(1);
264 EXPECT_CALL(*mock_login_display_, OnFadeOut()) 264 EXPECT_CALL(*mock_login_display_, OnFadeOut())
265 .Times(1); 265 .Times(1);
266 EXPECT_CALL(*mock_login_display_host_, 266 EXPECT_CALL(*mock_login_display_host_,
267 StartWizard(WizardController::kUserImageScreenName, NULL)) 267 StartWizard(WizardController::kUserImageScreenName, NULL))
268 .Times(0); 268 .Times(0);
269 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew()) 269 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew())
270 .Times(AnyNumber()) 270 .Times(AnyNumber())
271 .WillRepeatedly(Return(false)); 271 .WillRepeatedly(Return(false));
272 existing_user_controller()->Login(kUsername, kPassword); 272 existing_user_controller()->Login(kUsername, kPassword);
273 ui_test_utils::RunAllPendingInMessageLoop(); 273 content::RunAllPendingInMessageLoop();
274 } 274 }
275 275
276 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, 276 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
277 MAYBE_AutoEnrollAfterSignIn) { 277 MAYBE_AutoEnrollAfterSignIn) {
278 EXPECT_CALL(*mock_login_display_host_, 278 EXPECT_CALL(*mock_login_display_host_,
279 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _)) 279 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
280 .Times(1); 280 .Times(1);
281 EXPECT_CALL(*mock_login_display_, OnFadeOut()) 281 EXPECT_CALL(*mock_login_display_, OnFadeOut())
282 .Times(1); 282 .Times(1);
283 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin()) 283 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())
284 .Times(1); 284 .Times(1);
285 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew()) 285 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew())
286 .Times(AnyNumber()) 286 .Times(AnyNumber())
287 .WillRepeatedly(Return(false)); 287 .WillRepeatedly(Return(false));
288 existing_user_controller()->DoAutoEnrollment(); 288 existing_user_controller()->DoAutoEnrollment();
289 existing_user_controller()->CompleteLogin(kUsername, kPassword); 289 existing_user_controller()->CompleteLogin(kUsername, kPassword);
290 ui_test_utils::RunAllPendingInMessageLoop(); 290 content::RunAllPendingInMessageLoop();
291 } 291 }
292 292
293 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, 293 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
294 MAYBE_NewUserDontAutoEnrollAfterSignIn) { 294 MAYBE_NewUserDontAutoEnrollAfterSignIn) {
295 EXPECT_CALL(*mock_login_display_host_, 295 EXPECT_CALL(*mock_login_display_host_,
296 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _)) 296 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
297 .Times(0); 297 .Times(0);
298 // That will be sign in of a new user and (legacy) registration screen is 298 // That will be sign in of a new user and (legacy) registration screen is
299 // activated. In a real WizardController instance that is immediately switched 299 // activated. In a real WizardController instance that is immediately switched
300 // to image screen but this tests uses MockLoginDisplayHost instead. 300 // to image screen but this tests uses MockLoginDisplayHost instead.
(...skipping 12 matching lines...) Expand all
313 EXPECT_CALL(*mock_login_display_, OnLoginSuccess(kNewUsername)) 313 EXPECT_CALL(*mock_login_display_, OnLoginSuccess(kNewUsername))
314 .Times(1); 314 .Times(1);
315 EXPECT_CALL(*mock_login_display_, OnFadeOut()) 315 EXPECT_CALL(*mock_login_display_, OnFadeOut())
316 .Times(1); 316 .Times(1);
317 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin()) 317 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())
318 .Times(1); 318 .Times(1);
319 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew()) 319 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew())
320 .Times(AnyNumber()) 320 .Times(AnyNumber())
321 .WillRepeatedly(Return(true)); 321 .WillRepeatedly(Return(true));
322 existing_user_controller()->CompleteLogin(kNewUsername, kPassword); 322 existing_user_controller()->CompleteLogin(kNewUsername, kPassword);
323 ui_test_utils::RunAllPendingInMessageLoop(); 323 content::RunAllPendingInMessageLoop();
324 } 324 }
325 325
326 } // namespace chromeos 326 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698