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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // iframe (false) GAIA sign in. | 61 // iframe (false) GAIA sign in. |
62 class ProxyAuthOnUserBoardScreenTest | 62 class ProxyAuthOnUserBoardScreenTest |
63 : public LoginManagerTest, | 63 : public LoginManagerTest, |
64 public testing::WithParamInterface<bool> { | 64 public testing::WithParamInterface<bool> { |
65 public: | 65 public: |
66 ProxyAuthOnUserBoardScreenTest() | 66 ProxyAuthOnUserBoardScreenTest() |
67 : LoginManagerTest(true /* should_launch_browser */), | 67 : LoginManagerTest(true /* should_launch_browser */), |
68 proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY, | 68 proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY, |
69 net::SpawnedTestServer::kLocalhost, | 69 net::SpawnedTestServer::kLocalhost, |
70 base::FilePath()) { | 70 base::FilePath()) { |
71 // TODO(paulmeyer): Re-enable webview version of this test | 71 set_use_webview(GetParam()); |
72 // (uncomment this line) once http://crbug.com/452452 is fixed. | |
73 // set_use_webview(GetParam()); | |
74 } | 72 } |
75 | 73 |
76 ~ProxyAuthOnUserBoardScreenTest() override {} | 74 ~ProxyAuthOnUserBoardScreenTest() override {} |
77 | 75 |
78 void SetUp() override { | 76 void SetUp() override { |
79 ASSERT_TRUE(proxy_server_.Start()); | 77 ASSERT_TRUE(proxy_server_.Start()); |
80 LoginManagerTest::SetUp(); | 78 LoginManagerTest::SetUp(); |
81 } | 79 } |
82 | 80 |
83 void SetUpCommandLine(base::CommandLine* command_line) override { | 81 void SetUpCommandLine(base::CommandLine* command_line) override { |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(), | 119 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(), |
122 "window.domAutomationController.send(!!(" | 120 "window.domAutomationController.send(!!(" |
123 "$('add-user-button').click()" | 121 "$('add-user-button').click()" |
124 "));")); | 122 "));")); |
125 screen_waiter.Wait(); | 123 screen_waiter.Wait(); |
126 auth_dialog_waiter.Wait(); | 124 auth_dialog_waiter.Wait(); |
127 ASSERT_TRUE(auth_dialog_waiter.login_handler()); | 125 ASSERT_TRUE(auth_dialog_waiter.login_handler()); |
128 } | 126 } |
129 } | 127 } |
130 | 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, | 131 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, |
132 ProxyAuthOnUserBoardScreenTest, | 132 ProxyAuthOnUserBoardScreenTest, |
133 testing::Bool()); | 133 testing::Values(false)); |
134 | 134 |
135 } // namespace chromeos | 135 } // namespace chromeos |
OLD | NEW |