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

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

Issue 863263006: Migrating UpdateScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor Created 5 years, 10 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
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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 // Set up the mocks for all screens. 429 // Set up the mocks for all screens.
430 mock_network_screen_.reset(new MockNetworkScreen( 430 mock_network_screen_.reset(new MockNetworkScreen(
431 WizardController::default_controller(), 431 WizardController::default_controller(),
432 WizardController::default_controller(), GetOobeUI()->GetNetworkView())); 432 WizardController::default_controller(), GetOobeUI()->GetNetworkView()));
433 mock_network_screen_->Initialize(nullptr /* context */); 433 mock_network_screen_->Initialize(nullptr /* context */);
434 WizardController::default_controller() 434 WizardController::default_controller()
435 ->screens_[WizardController::kNetworkScreenName] = mock_network_screen_; 435 ->screens_[WizardController::kNetworkScreenName] = mock_network_screen_;
436 EXPECT_CALL(*mock_network_screen_, Show()).Times(0); 436 EXPECT_CALL(*mock_network_screen_, Show()).Times(0);
437 EXPECT_CALL(*mock_network_screen_, Hide()).Times(0); 437 EXPECT_CALL(*mock_network_screen_, Hide()).Times(0);
438 438
439 MOCK(mock_update_screen_, 439 MOCK(mock_update_screen_, kUpdateScreenName, MockUpdateScreen,
440 kUpdateScreenName, 440 MockUpdateView);
441 MockUpdateScreen,
442 MockUpdateScreenActor);
443 MOCK_WITH_DELEGATE(mock_eula_screen_, kEulaScreenName, MockEulaScreen, 441 MOCK_WITH_DELEGATE(mock_eula_screen_, kEulaScreenName, MockEulaScreen,
444 MockEulaView); 442 MockEulaView);
445 MOCK(mock_enrollment_screen_, 443 MOCK(mock_enrollment_screen_,
446 kEnrollmentScreenName, 444 kEnrollmentScreenName,
447 MockEnrollmentScreen, 445 MockEnrollmentScreen,
448 MockEnrollmentScreenActor); 446 MockEnrollmentScreenActor);
449 MOCK(mock_auto_enrollment_check_screen_, 447 MOCK(mock_auto_enrollment_check_screen_,
450 kAutoEnrollmentCheckScreenName, 448 kAutoEnrollmentCheckScreenName,
451 MockAutoEnrollmentCheckScreen, 449 MockAutoEnrollmentCheckScreen,
452 MockAutoEnrollmentCheckScreenActor); 450 MockAutoEnrollmentCheckScreenActor);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 524
527 runner->Run(); 525 runner->Run();
528 } 526 }
529 527
530 void ResetAutoEnrollmentCheckScreen() { 528 void ResetAutoEnrollmentCheckScreen() {
531 WizardController::default_controller()->screens_.erase( 529 WizardController::default_controller()->screens_.erase(
532 WizardController::kAutoEnrollmentCheckScreenName); 530 WizardController::kAutoEnrollmentCheckScreenName);
533 } 531 }
534 532
535 linked_ptr<MockNetworkScreen> mock_network_screen_; 533 linked_ptr<MockNetworkScreen> mock_network_screen_;
536 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_; 534 MockOutShowHide<MockUpdateScreen, MockUpdateView>* mock_update_screen_;
537 MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_; 535 MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
538 MockOutShowHide<MockEnrollmentScreen, 536 MockOutShowHide<MockEnrollmentScreen,
539 MockEnrollmentScreenActor>* mock_enrollment_screen_; 537 MockEnrollmentScreenActor>* mock_enrollment_screen_;
540 MockOutShowHide<MockAutoEnrollmentCheckScreen, 538 MockOutShowHide<MockAutoEnrollmentCheckScreen,
541 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_; 539 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
542 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>* 540 MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>*
543 mock_wrong_hwid_screen_; 541 mock_wrong_hwid_screen_;
544 MockOutShowHide<MockEnableDebuggingScreen, 542 MockOutShowHide<MockEnableDebuggingScreen,
545 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_; 543 MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_;
546 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_; 544 scoped_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_;
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1229 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1232 // UI and logic is ready. http://crbug.com/127016 1230 // UI and logic is ready. http://crbug.com/127016
1233 1231
1234 // TODO(dzhioev): Add tests for controller/host pairing flow. 1232 // TODO(dzhioev): Add tests for controller/host pairing flow.
1235 // http://crbug.com/375191 1233 // http://crbug.com/375191
1236 1234
1237 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 24, 1235 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
1238 "tests for new control flow are missing"); 1236 "tests for new control flow are missing");
1239 1237
1240 } // namespace chromeos 1238 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/resources/chromeos/login/oobe_screen_update.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698