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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments. Created 6 years 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
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 "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 418
419 // Set up the mocks for all screens. 419 // Set up the mocks for all screens.
420 MOCK(mock_network_screen_, 420 MOCK(mock_network_screen_,
421 kNetworkScreenName, 421 kNetworkScreenName,
422 MockNetworkScreen, 422 MockNetworkScreen,
423 MockNetworkScreenActor); 423 MockNetworkScreenActor);
424 MOCK(mock_update_screen_, 424 MOCK(mock_update_screen_,
425 kUpdateScreenName, 425 kUpdateScreenName,
426 MockUpdateScreen, 426 MockUpdateScreen,
427 MockUpdateScreenActor); 427 MockUpdateScreenActor);
428 MOCK_WITH_DELEGATE(mock_eula_screen_, 428 MOCK_WITH_DELEGATE(mock_eula_screen_, kEulaScreenName, MockEulaScreen,
429 kEulaScreenName, 429 MockEulaView);
430 MockEulaScreen,
431 MockEulaScreenActor);
432 MOCK(mock_enrollment_screen_, 430 MOCK(mock_enrollment_screen_,
433 kEnrollmentScreenName, 431 kEnrollmentScreenName,
434 MockEnrollmentScreen, 432 MockEnrollmentScreen,
435 MockEnrollmentScreenActor); 433 MockEnrollmentScreenActor);
436 MOCK(mock_auto_enrollment_check_screen_, 434 MOCK(mock_auto_enrollment_check_screen_,
437 kAutoEnrollmentCheckScreenName, 435 kAutoEnrollmentCheckScreenName,
438 MockAutoEnrollmentCheckScreen, 436 MockAutoEnrollmentCheckScreen,
439 MockAutoEnrollmentCheckScreenActor); 437 MockAutoEnrollmentCheckScreenActor);
440 MOCK(mock_wrong_hwid_screen_, kWrongHWIDScreenName, MockWrongHWIDScreen, 438 MOCK(mock_wrong_hwid_screen_, kWrongHWIDScreenName, MockWrongHWIDScreen,
441 MockWrongHWIDScreenActor); 439 MockWrongHWIDScreenActor);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 } 512 }
515 513
516 void ResetAutoEnrollmentCheckScreen() { 514 void ResetAutoEnrollmentCheckScreen() {
517 WizardController::default_controller()->screens_.erase( 515 WizardController::default_controller()->screens_.erase(
518 WizardController::kAutoEnrollmentCheckScreenName); 516 WizardController::kAutoEnrollmentCheckScreenName);
519 } 517 }
520 518
521 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>* 519 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>*
522 mock_network_screen_; 520 mock_network_screen_;
523 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_; 521 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_;
524 MockOutShowHide<MockEulaScreen, MockEulaScreenActor>* mock_eula_screen_; 522 MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
525 MockOutShowHide<MockEnrollmentScreen, 523 MockOutShowHide<MockEnrollmentScreen,
526 MockEnrollmentScreenActor>* mock_enrollment_screen_; 524 MockEnrollmentScreenActor>* mock_enrollment_screen_;
527 MockOutShowHide<MockAutoEnrollmentCheckScreen, 525 MockOutShowHide<MockAutoEnrollmentCheckScreen,
528 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_; 526 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
529 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>* 527 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>*
530 mock_wrong_hwid_screen_; 528 mock_wrong_hwid_screen_;
531 MockOutShowHide<MockEnableDebuggingScreen, 529 MockOutShowHide<MockEnableDebuggingScreen,
532 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_; 530 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_;
533 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_; 531 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_;
534 532
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1267 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1270 // UI and logic is ready. http://crbug.com/127016 1268 // UI and logic is ready. http://crbug.com/127016
1271 1269
1272 // TODO(dzhioev): Add tests for controller/host pairing flow. 1270 // TODO(dzhioev): Add tests for controller/host pairing flow.
1273 // http://crbug.com/375191 1271 // http://crbug.com/375191
1274 1272
1275 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 25, 1273 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 25,
1276 add_tests_for_new_control_flow_you_just_introduced); 1274 add_tests_for_new_control_flow_you_just_introduced);
1277 1275
1278 } // namespace chromeos 1276 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698