OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/chromeos/login/login_manager_test.h" | 10 #include "chrome/browser/chromeos/login/login_manager_test.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(), | 119 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(), |
120 "window.domAutomationController.send(!!(" | 120 "window.domAutomationController.send(!!(" |
121 "$('add-user-button').click()" | 121 "$('add-user-button').click()" |
122 "));")); | 122 "));")); |
123 screen_waiter.Wait(); | 123 screen_waiter.Wait(); |
124 auth_dialog_waiter.Wait(); | 124 auth_dialog_waiter.Wait(); |
125 ASSERT_TRUE(auth_dialog_waiter.login_handler()); | 125 ASSERT_TRUE(auth_dialog_waiter.login_handler()); |
126 } | 126 } |
127 } | 127 } |
128 | 128 |
129 // TODO(paulmeyer): Re-enable webview version of this test | |
130 // (once http://crbug.com/452452 is fixed. | |
131 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, | 129 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, |
132 ProxyAuthOnUserBoardScreenTest, | 130 ProxyAuthOnUserBoardScreenTest, |
133 testing::Values(false)); | 131 testing::Bool()); |
134 | 132 |
135 } // namespace chromeos | 133 } // namespace chromeos |
OLD | NEW |