| OLD | NEW |
| 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/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
| (...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1032 content::WindowedNotificationObserver auth_needed_waiter( | 1032 content::WindowedNotificationObserver auth_needed_waiter( |
| 1033 chrome::NOTIFICATION_AUTH_NEEDED, | 1033 chrome::NOTIFICATION_AUTH_NEEDED, |
| 1034 content::NotificationService::AllSources()); | 1034 content::NotificationService::AllSources()); |
| 1035 | 1035 |
| 1036 CheckCurrentScreen(WizardController::kNetworkScreenName); | 1036 CheckCurrentScreen(WizardController::kNetworkScreenName); |
| 1037 | 1037 |
| 1038 LoginDisplayHostImpl::default_host()->StartSignInScreen(LoginScreenContext()); | 1038 LoginDisplayHostImpl::default_host()->StartSignInScreen(LoginScreenContext()); |
| 1039 auth_needed_waiter.Wait(); | 1039 auth_needed_waiter.Wait(); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 // TODO(paulmeyer): Re-enable webview version of this test | |
| 1043 // (drop this condition) once http://crbug.com/452452 is fixed. | |
| 1044 INSTANTIATE_TEST_CASE_P(WizardControllerProxyAuthOnSigninSuite, | 1042 INSTANTIATE_TEST_CASE_P(WizardControllerProxyAuthOnSigninSuite, |
| 1045 WizardControllerProxyAuthOnSigninTest, | 1043 WizardControllerProxyAuthOnSigninTest, |
| 1046 testing::Values(false)); | 1044 testing::Bool()); |
| 1047 | 1045 |
| 1048 class WizardControllerKioskFlowTest : public WizardControllerFlowTest { | 1046 class WizardControllerKioskFlowTest : public WizardControllerFlowTest { |
| 1049 protected: | 1047 protected: |
| 1050 WizardControllerKioskFlowTest() {} | 1048 WizardControllerKioskFlowTest() {} |
| 1051 | 1049 |
| 1052 // Overridden from InProcessBrowserTest: | 1050 // Overridden from InProcessBrowserTest: |
| 1053 void SetUpCommandLine(base::CommandLine* command_line) override { | 1051 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 1054 base::FilePath test_data_dir; | 1052 base::FilePath test_data_dir; |
| 1055 ASSERT_TRUE(chromeos::test_utils::GetTestDataPath( | 1053 ASSERT_TRUE(chromeos::test_utils::GetTestDataPath( |
| 1056 "app_mode", "kiosk_manifest", &test_data_dir)); | 1054 "app_mode", "kiosk_manifest", &test_data_dir)); |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1263 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when | 1261 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when |
| 1264 // UI and logic is ready. http://crbug.com/127016 | 1262 // UI and logic is ready. http://crbug.com/127016 |
| 1265 | 1263 |
| 1266 // TODO(dzhioev): Add tests for controller/host pairing flow. | 1264 // TODO(dzhioev): Add tests for controller/host pairing flow. |
| 1267 // http://crbug.com/375191 | 1265 // http://crbug.com/375191 |
| 1268 | 1266 |
| 1269 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 24, | 1267 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 24, |
| 1270 "tests for new control flow are missing"); | 1268 "tests for new control flow are missing"); |
| 1271 | 1269 |
| 1272 } // namespace chromeos | 1270 } // namespace chromeos |
| OLD | NEW |