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

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

Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes. (Closed)
Patch Set: Add missing #includes. Created 4 years, 2 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 "ash/common/accessibility_types.h" 7 #include "ash/common/accessibility_types.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/macros.h" 10 #include "base/macros.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 34 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
35 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 35 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
36 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" 36 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
37 #include "chrome/browser/chromeos/login/startup_utils.h" 37 #include "chrome/browser/chromeos/login/startup_utils.h"
38 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" 38 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
39 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 39 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
40 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 40 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
41 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" 41 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
42 #include "chrome/browser/chromeos/policy/enrollment_config.h" 42 #include "chrome/browser/chromeos/policy/enrollment_config.h"
43 #include "chrome/browser/chromeos/policy/server_backed_device_state.h" 43 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
44 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
45 #include "chrome/browser/chromeos/profiles/profile_helper.h" 44 #include "chrome/browser/chromeos/profiles/profile_helper.h"
45 #include "chrome/browser/chromeos/settings/stub_install_attributes.h"
46 #include "chrome/browser/profiles/profile_manager.h" 46 #include "chrome/browser/profiles/profile_manager.h"
47 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 47 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
48 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 48 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
49 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
51 #include "chrome/grit/generated_resources.h" 51 #include "chrome/grit/generated_resources.h"
52 #include "chromeos/audio/cras_audio_handler.h" 52 #include "chromeos/audio/cras_audio_handler.h"
53 #include "chromeos/chromeos_switches.h" 53 #include "chromeos/chromeos_switches.h"
54 #include "chromeos/chromeos_test_utils.h" 54 #include "chromeos/chromeos_test_utils.h"
55 #include "chromeos/dbus/dbus_thread_manager.h" 55 #include "chromeos/dbus/dbus_thread_manager.h"
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 chromeos::AutoEnrollmentController::kForcedReEnrollmentAlways); 739 chromeos::AutoEnrollmentController::kForcedReEnrollmentAlways);
740 command_line->AppendSwitchASCII( 740 command_line->AppendSwitchASCII(
741 switches::kEnterpriseEnrollmentInitialModulus, "1"); 741 switches::kEnterpriseEnrollmentInitialModulus, "1");
742 command_line->AppendSwitchASCII( 742 command_line->AppendSwitchASCII(
743 switches::kEnterpriseEnrollmentModulusLimit, "2"); 743 switches::kEnterpriseEnrollmentModulusLimit, "2");
744 } 744 }
745 745
746 system::ScopedFakeStatisticsProvider fake_statistics_provider_; 746 system::ScopedFakeStatisticsProvider fake_statistics_provider_;
747 747
748 private: 748 private:
749 policy::ScopedStubEnterpriseInstallAttributes install_attributes_; 749 ScopedStubInstallAttributes install_attributes_;
750 750
751 DISALLOW_COPY_AND_ASSIGN(WizardControllerDeviceStateTest); 751 DISALLOW_COPY_AND_ASSIGN(WizardControllerDeviceStateTest);
752 }; 752 };
753 753
754 IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest, 754 IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
755 ControlFlowForcedReEnrollment) { 755 ControlFlowForcedReEnrollment) {
756 CheckCurrentScreen(WizardController::kNetworkScreenName); 756 CheckCurrentScreen(WizardController::kNetworkScreenName);
757 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); 757 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
758 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); 758 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
759 OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED); 759 OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1222 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1223 // UI and logic is ready. http://crbug.com/127016 1223 // UI and logic is ready. http://crbug.com/127016
1224 1224
1225 // TODO(dzhioev): Add tests for controller/host pairing flow. 1225 // TODO(dzhioev): Add tests for controller/host pairing flow.
1226 // http://crbug.com/375191 1226 // http://crbug.com/375191
1227 1227
1228 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23, 1228 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23,
1229 "tests for new control flow are missing"); 1229 "tests for new control flow are missing");
1230 1230
1231 } // namespace chromeos 1231 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698