Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // End-to-end tests for WebSocket. | 5 // End-to-end tests for WebSocket. |
| 6 // | 6 // |
| 7 // A python server is (re)started for each test, which is moderately | 7 // A python server is (re)started for each test, which is moderately |
| 8 // inefficient. However, it makes these tests a good fit for scenarios which | 8 // inefficient. However, it makes these tests a good fit for scenarios which |
| 9 // require special server configurations. | 9 // require special server configurations. |
| 10 | 10 |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 205 }; | 205 }; |
| 206 | 206 |
| 207 const ResolvedProxyInfo& resolved_proxy_info() const { | 207 const ResolvedProxyInfo& resolved_proxy_info() const { |
| 208 return resolved_proxy_info_; | 208 return resolved_proxy_info_; |
| 209 } | 209 } |
| 210 | 210 |
| 211 protected: | 211 protected: |
| 212 void OnResolveProxy(const GURL& url, | 212 void OnResolveProxy(const GURL& url, |
| 213 int load_flags, | 213 int load_flags, |
| 214 const ProxyService& proxy_service, | 214 const ProxyService& proxy_service, |
| 215 const std::string& method, | |
|
bengr
2016/02/16 20:00:14
Move the method to just after the url.
RyanSturm
2016/02/17 21:46:12
Done.
| |
| 215 ProxyInfo* result) override { | 216 ProxyInfo* result) override { |
| 216 resolved_proxy_info_.url = url; | 217 resolved_proxy_info_.url = url; |
| 217 resolved_proxy_info_.proxy_info = *result; | 218 resolved_proxy_info_.proxy_info = *result; |
| 218 } | 219 } |
| 219 | 220 |
| 220 void OnTunnelConnectCompleted(const HostPortPair& endpoint, | 221 void OnTunnelConnectCompleted(const HostPortPair& endpoint, |
| 221 const HostPortPair& proxy_server, | 222 const HostPortPair& proxy_server, |
| 222 int net_error) override {} | 223 int net_error) override {} |
| 223 void OnFallback(const ProxyServer& bad_proxy, int net_error) override {} | 224 void OnFallback(const ProxyServer& bad_proxy, int net_error) override {} |
| 224 void OnBeforeSendHeaders(URLRequest* request, | 225 void OnBeforeSendHeaders(URLRequest* request, |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 510 GURL ws_url = ws_server.GetURL("header-continuation"); | 511 GURL ws_url = ws_server.GetURL("header-continuation"); |
| 511 | 512 |
| 512 EXPECT_TRUE(ConnectAndWait(ws_url)); | 513 EXPECT_TRUE(ConnectAndWait(ws_url)); |
| 513 EXPECT_EQ("permessage-deflate; server_max_window_bits=10", | 514 EXPECT_EQ("permessage-deflate; server_max_window_bits=10", |
| 514 event_interface_->extensions()); | 515 event_interface_->extensions()); |
| 515 } | 516 } |
| 516 | 517 |
| 517 } // namespace | 518 } // namespace |
| 518 | 519 |
| 519 } // namespace net | 520 } // namespace net |
| OLD | NEW |