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 "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/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/stringprintf.h" | |
10 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
11 #include "build/build_config.h" | 10 #include "build/build_config.h" |
12 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/login/login_handler.h" | 13 #include "chrome/browser/ui/login/login_handler.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
19 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 | 90 |
92 void SetUpCommandLine(base::CommandLine* command_line) override { | 91 void SetUpCommandLine(base::CommandLine* command_line) override { |
93 command_line->AppendSwitchASCII(switches::kProxyServer, | 92 command_line->AppendSwitchASCII(switches::kProxyServer, |
94 proxy_server_.host_port_pair().ToString()); | 93 proxy_server_.host_port_pair().ToString()); |
95 } | 94 } |
96 | 95 |
97 protected: | 96 protected: |
98 net::SpawnedTestServer proxy_server_; | 97 net::SpawnedTestServer proxy_server_; |
99 | 98 |
100 private: | 99 private: |
101 | |
102 DISALLOW_COPY_AND_ASSIGN(ProxyBrowserTest); | 100 DISALLOW_COPY_AND_ASSIGN(ProxyBrowserTest); |
103 }; | 101 }; |
104 | 102 |
105 #if defined(OS_CHROMEOS) | 103 #if defined(OS_CHROMEOS) |
106 // We bypass manually installed proxy for localhost on chromeos. | 104 // We bypass manually installed proxy for localhost on chromeos. |
107 #define MAYBE_BasicAuthWSConnect DISABLED_BasicAuthWSConnect | 105 #define MAYBE_BasicAuthWSConnect DISABLED_BasicAuthWSConnect |
108 #else | 106 #else |
109 #define MAYBE_BasicAuthWSConnect BasicAuthWSConnect | 107 #define MAYBE_BasicAuthWSConnect BasicAuthWSConnect |
110 #endif | 108 #endif |
111 // Test that the browser can establish a WebSocket connection via a proxy | 109 // Test that the browser can establish a WebSocket connection via a proxy |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 | 269 |
272 private: | 270 private: |
273 DISALLOW_COPY_AND_ASSIGN(OutOfProcessProxyResolverBrowserTest); | 271 DISALLOW_COPY_AND_ASSIGN(OutOfProcessProxyResolverBrowserTest); |
274 }; | 272 }; |
275 | 273 |
276 IN_PROC_BROWSER_TEST_F(OutOfProcessProxyResolverBrowserTest, Verify) { | 274 IN_PROC_BROWSER_TEST_F(OutOfProcessProxyResolverBrowserTest, Verify) { |
277 VerifyProxyScript(browser()); | 275 VerifyProxyScript(browser()); |
278 } | 276 } |
279 | 277 |
280 } // namespace | 278 } // namespace |
OLD | NEW |