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

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

Issue 539483002: Move all typecasting code to individual screens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Some more fixes Created 6 years, 3 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basictypes.h" 5 #include "base/basictypes.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/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 OnExit(ScreenObserver::EULA_ACCEPTED); 733 OnExit(ScreenObserver::EULA_ACCEPTED);
734 // Let update screen smooth time process (time = 0ms). 734 // Let update screen smooth time process (time = 0ms).
735 content::RunAllPendingInMessageLoop(); 735 content::RunAllPendingInMessageLoop();
736 736
737 CheckCurrentScreen(WizardController::kUpdateScreenName); 737 CheckCurrentScreen(WizardController::kUpdateScreenName);
738 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); 738 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
739 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1); 739 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
740 OnExit(ScreenObserver::UPDATE_INSTALLED); 740 OnExit(ScreenObserver::UPDATE_INSTALLED);
741 741
742 AutoEnrollmentCheckScreen* screen = 742 AutoEnrollmentCheckScreen* screen =
743 WizardController::default_controller()->GetAutoEnrollmentCheckScreen(); 743 AutoEnrollmentCheckScreen::Get(WizardController::default_controller());
744 EXPECT_EQ(screen, 744 EXPECT_EQ(screen,
745 WizardController::default_controller()->current_screen()); 745 WizardController::default_controller()->current_screen());
746 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1); 746 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
747 screen->Start(); 747 screen->Start();
748 // Wait for auto-enrollment controller to encounter the connection error. 748 // Wait for auto-enrollment controller to encounter the connection error.
749 WaitForAutoEnrollmentState(policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR); 749 WaitForAutoEnrollmentState(policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR);
750 750
751 // The error screen shows up if there's no auto-enrollment decision. 751 // The error screen shows up if there's no auto-enrollment decision.
752 EXPECT_FALSE(StartupUtils::IsOobeCompleted()); 752 EXPECT_FALSE(StartupUtils::IsOobeCompleted());
753 EXPECT_EQ(GetErrorScreen(), 753 EXPECT_EQ(GetErrorScreen(),
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1066 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1066 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1067 // UI and logic is ready. http://crbug.com/127016 1067 // UI and logic is ready. http://crbug.com/127016
1068 1068
1069 // TODO(dzhioev): Add tests for controller/host pairing flow. 1069 // TODO(dzhioev): Add tests for controller/host pairing flow.
1070 // http://crbug.com/375191 1070 // http://crbug.com/375191
1071 1071
1072 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 23, 1072 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 23,
1073 add_tests_for_new_control_flow_you_just_introduced); 1073 add_tests_for_new_control_flow_you_just_introduced);
1074 1074
1075 } // namespace chromeos 1075 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698