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

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

Issue 1095843003: [cros] Modify oobe/login tests to work with webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable blocking test Created 5 years, 8 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 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // TODO(paulmeyer): Re-enable webview version of this test
72 // (uncomment this line) once http://crbug.com/452452 is fixed. 72 // (once http://crbug.com/452452 is fixed.
73 // set_use_webview(GetParam()); 73 set_use_webview(false);
Dmitry Polukhin 2015/04/22 06:47:07 dito, there is no sense t run the same test twice
Nikita (slow) 2015/04/22 09:01:45 Done.
74 } 74 }
75 75
76 ~ProxyAuthOnUserBoardScreenTest() override {} 76 ~ProxyAuthOnUserBoardScreenTest() override {}
77 77
78 void SetUp() override { 78 void SetUp() override {
79 ASSERT_TRUE(proxy_server_.Start()); 79 ASSERT_TRUE(proxy_server_.Start());
80 LoginManagerTest::SetUp(); 80 LoginManagerTest::SetUp();
81 } 81 }
82 82
83 void SetUpCommandLine(base::CommandLine* command_line) override { 83 void SetUpCommandLine(base::CommandLine* command_line) override {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 auth_dialog_waiter.Wait(); 126 auth_dialog_waiter.Wait();
127 ASSERT_TRUE(auth_dialog_waiter.login_handler()); 127 ASSERT_TRUE(auth_dialog_waiter.login_handler());
128 } 128 }
129 } 129 }
130 130
131 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, 131 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite,
132 ProxyAuthOnUserBoardScreenTest, 132 ProxyAuthOnUserBoardScreenTest,
133 testing::Bool()); 133 testing::Bool());
134 134
135 } // namespace chromeos 135 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698