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

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: Comments addressed. 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 // Set up the mocks for all screens. 420 // Set up the mocks for all screens.
421 MOCK(mock_network_screen_, 421 MOCK(mock_network_screen_,
422 kNetworkScreenName, 422 kNetworkScreenName,
423 MockNetworkScreen, 423 MockNetworkScreen,
424 MockNetworkScreenActor); 424 MockNetworkScreenActor);
425 MOCK(mock_update_screen_, 425 MOCK(mock_update_screen_,
426 kUpdateScreenName, 426 kUpdateScreenName,
427 MockUpdateScreen, 427 MockUpdateScreen,
428 MockUpdateScreenActor); 428 MockUpdateScreenActor);
429 MOCK_WITH_DELEGATE(mock_eula_screen_, 429 MOCK_WITH_DELEGATE(mock_eula_screen_, kEulaScreenName, MockEulaScreen,
430 kEulaScreenName, 430 MockEulaView);
431 MockEulaScreen,
432 MockEulaScreenActor);
433 MOCK(mock_enrollment_screen_, 431 MOCK(mock_enrollment_screen_,
434 kEnrollmentScreenName, 432 kEnrollmentScreenName,
435 MockEnrollmentScreen, 433 MockEnrollmentScreen,
436 MockEnrollmentScreenActor); 434 MockEnrollmentScreenActor);
437 MOCK(mock_auto_enrollment_check_screen_, 435 MOCK(mock_auto_enrollment_check_screen_,
438 kAutoEnrollmentCheckScreenName, 436 kAutoEnrollmentCheckScreenName,
439 MockAutoEnrollmentCheckScreen, 437 MockAutoEnrollmentCheckScreen,
440 MockAutoEnrollmentCheckScreenActor); 438 MockAutoEnrollmentCheckScreenActor);
441 MOCK(mock_wrong_hwid_screen_, kWrongHWIDScreenName, MockWrongHWIDScreen, 439 MOCK(mock_wrong_hwid_screen_, kWrongHWIDScreenName, MockWrongHWIDScreen,
442 MockWrongHWIDScreenActor); 440 MockWrongHWIDScreenActor);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 } 513 }
516 514
517 void ResetAutoEnrollmentCheckScreen() { 515 void ResetAutoEnrollmentCheckScreen() {
518 WizardController::default_controller()->screens_.erase( 516 WizardController::default_controller()->screens_.erase(
519 WizardController::kAutoEnrollmentCheckScreenName); 517 WizardController::kAutoEnrollmentCheckScreenName);
520 } 518 }
521 519
522 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>* 520 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>*
523 mock_network_screen_; 521 mock_network_screen_;
524 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_; 522 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_;
525 MockOutShowHide<MockEulaScreen, MockEulaScreenActor>* mock_eula_screen_; 523 MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
526 MockOutShowHide<MockEnrollmentScreen, 524 MockOutShowHide<MockEnrollmentScreen,
527 MockEnrollmentScreenActor>* mock_enrollment_screen_; 525 MockEnrollmentScreenActor>* mock_enrollment_screen_;
528 MockOutShowHide<MockAutoEnrollmentCheckScreen, 526 MockOutShowHide<MockAutoEnrollmentCheckScreen,
529 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_; 527 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
530 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>* 528 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>*
531 mock_wrong_hwid_screen_; 529 mock_wrong_hwid_screen_;
532 MockOutShowHide<MockEnableDebuggingScreen, 530 MockOutShowHide<MockEnableDebuggingScreen,
533 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_; 531 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_;
534 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_; 532 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_;
535 533
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1264 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1267 // UI and logic is ready. http://crbug.com/127016 1265 // UI and logic is ready. http://crbug.com/127016
1268 1266
1269 // TODO(dzhioev): Add tests for controller/host pairing flow. 1267 // TODO(dzhioev): Add tests for controller/host pairing flow.
1270 // http://crbug.com/375191 1268 // http://crbug.com/375191
1271 1269
1272 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 25, 1270 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 25,
1273 add_tests_for_new_control_flow_you_just_introduced); 1271 add_tests_for_new_control_flow_you_just_introduced);
1274 1272
1275 } // namespace chromeos 1273 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698