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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: callback design (not yet done) Created 6 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
OLDNEW
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 "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 enable_do_not_track_(NULL), 289 enable_do_not_track_(NULL),
290 force_google_safe_search_(NULL), 290 force_google_safe_search_(NULL),
291 #if defined(ENABLE_CONFIGURATION_POLICY) 291 #if defined(ENABLE_CONFIGURATION_POLICY)
292 url_blacklist_manager_(NULL), 292 url_blacklist_manager_(NULL),
293 #endif 293 #endif
294 domain_reliability_monitor_(NULL), 294 domain_reliability_monitor_(NULL),
295 received_content_length_(0), 295 received_content_length_(0),
296 original_content_length_(0), 296 original_content_length_(0),
297 first_request_(true), 297 first_request_(true),
298 prerender_tracker_(NULL), 298 prerender_tracker_(NULL),
299 data_reduction_proxy_params_(NULL) { 299 data_reduction_proxy_params_(NULL),
300 on_resolve_proxy_handler_(NULL) {
300 DCHECK(enable_referrers); 301 DCHECK(enable_referrers);
301 extensions_delegate_.reset( 302 extensions_delegate_.reset(
302 ChromeExtensionsNetworkDelegate::Create(event_router)); 303 ChromeExtensionsNetworkDelegate::Create(event_router));
303 } 304 }
304 305
305 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 306 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
306 307
307 void ChromeNetworkDelegate::set_extension_info_map( 308 void ChromeNetworkDelegate::set_extension_info_map(
308 extensions::InfoMap* extension_info_map) { 309 extensions::InfoMap* extension_info_map) {
309 extensions_delegate_->set_extension_info_map(extension_info_map); 310 extensions_delegate_->set_extension_info_map(extension_info_map);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 462
462 if (force_safe_search && rv == net::OK && new_url->is_empty()) 463 if (force_safe_search && rv == net::OK && new_url->is_empty())
463 ForceGoogleSafeSearch(request, new_url); 464 ForceGoogleSafeSearch(request, new_url);
464 465
465 if (connect_interceptor_) 466 if (connect_interceptor_)
466 connect_interceptor_->WitnessURLRequest(request); 467 connect_interceptor_->WitnessURLRequest(request);
467 468
468 return rv; 469 return rv;
469 } 470 }
470 471
472 void ChromeNetworkDelegate::OnResolveProxy(
473 const GURL& url, int load_flags, net::ProxyInfo* result) {
474 if (on_resolve_proxy_handler_) {
475 on_resolve_proxy_handler_->Run(url, load_flags, result);
476 }
477 }
478
471 int ChromeNetworkDelegate::OnBeforeSendHeaders( 479 int ChromeNetworkDelegate::OnBeforeSendHeaders(
472 net::URLRequest* request, 480 net::URLRequest* request,
473 const net::CompletionCallback& callback, 481 const net::CompletionCallback& callback,
474 net::HttpRequestHeaders* headers) { 482 net::HttpRequestHeaders* headers) {
475 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest"); 483 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest");
476 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers); 484 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);
477 } 485 }
478 486
479 void ChromeNetworkDelegate::OnSendHeaders( 487 void ChromeNetworkDelegate::OnSendHeaders(
480 net::URLRequest* request, 488 net::URLRequest* request,
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 data_reduction_proxy::DataReductionProxyRequestType request_type) { 813 data_reduction_proxy::DataReductionProxyRequestType request_type) {
806 DCHECK_GE(received_content_length, 0); 814 DCHECK_GE(received_content_length, 0);
807 DCHECK_GE(original_content_length, 0); 815 DCHECK_GE(original_content_length, 0);
808 StoreAccumulatedContentLength(received_content_length, 816 StoreAccumulatedContentLength(received_content_length,
809 original_content_length, 817 original_content_length,
810 request_type, 818 request_type,
811 reinterpret_cast<Profile*>(profile_)); 819 reinterpret_cast<Profile*>(profile_));
812 received_content_length_ += received_content_length; 820 received_content_length_ += received_content_length;
813 original_content_length_ += original_content_length; 821 original_content_length_ += original_content_length;
814 } 822 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698