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

Side by Side Diff: net/websockets/websocket_end_to_end_test.cc

Issue 2110973002: Removing load_flags from ProxyService and ProxyDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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
« no previous file with comments | « net/url_request/url_request_ftp_job.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 ProxyInfo proxy_info; 206 ProxyInfo proxy_info;
207 }; 207 };
208 208
209 const ResolvedProxyInfo& resolved_proxy_info() const { 209 const ResolvedProxyInfo& resolved_proxy_info() const {
210 return resolved_proxy_info_; 210 return resolved_proxy_info_;
211 } 211 }
212 212
213 protected: 213 protected:
214 void OnResolveProxy(const GURL& url, 214 void OnResolveProxy(const GURL& url,
215 const std::string& method, 215 const std::string& method,
216 int load_flags,
217 const ProxyService& proxy_service, 216 const ProxyService& proxy_service,
218 ProxyInfo* result) override { 217 ProxyInfo* result) override {
219 resolved_proxy_info_.url = url; 218 resolved_proxy_info_.url = url;
220 resolved_proxy_info_.proxy_info = *result; 219 resolved_proxy_info_.proxy_info = *result;
221 } 220 }
222 221
223 void OnTunnelConnectCompleted(const HostPortPair& endpoint, 222 void OnTunnelConnectCompleted(const HostPortPair& endpoint,
224 const HostPortPair& proxy_server, 223 const HostPortPair& proxy_server,
225 int net_error) override {} 224 int net_error) override {}
226 void OnFallback(const ProxyServer& bad_proxy, int net_error) override {} 225 void OnFallback(const ProxyServer& bad_proxy, int net_error) override {}
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 GURL ws_url = ws_server.GetURL("header-continuation"); 511 GURL ws_url = ws_server.GetURL("header-continuation");
513 512
514 EXPECT_TRUE(ConnectAndWait(ws_url)); 513 EXPECT_TRUE(ConnectAndWait(ws_url));
515 EXPECT_EQ("permessage-deflate; server_max_window_bits=10", 514 EXPECT_EQ("permessage-deflate; server_max_window_bits=10",
516 event_interface_->extensions()); 515 event_interface_->extensions());
517 } 516 }
518 517
519 } // namespace 518 } // namespace
520 519
521 } // namespace net 520 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_ftp_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698