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

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: make LOAD_NORMAL consistent 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 #if defined(ENABLE_CONFIGURATION_POLICY) 295 #if defined(ENABLE_CONFIGURATION_POLICY)
296 url_blacklist_manager_(NULL), 296 url_blacklist_manager_(NULL),
297 #endif 297 #endif
298 domain_reliability_monitor_(NULL), 298 domain_reliability_monitor_(NULL),
299 received_content_length_(0), 299 received_content_length_(0),
300 original_content_length_(0), 300 original_content_length_(0),
301 first_request_(true), 301 first_request_(true),
302 prerender_tracker_(NULL), 302 prerender_tracker_(NULL),
303 data_reduction_proxy_params_(NULL), 303 data_reduction_proxy_params_(NULL),
304 data_reduction_proxy_usage_stats_(NULL), 304 data_reduction_proxy_usage_stats_(NULL),
305 data_reduction_proxy_auth_request_handler_(NULL) { 305 data_reduction_proxy_auth_request_handler_(NULL),
306 on_resolve_proxy_handler_(NULL) {
306 DCHECK(enable_referrers); 307 DCHECK(enable_referrers);
307 extensions_delegate_.reset( 308 extensions_delegate_.reset(
308 ChromeExtensionsNetworkDelegate::Create(event_router)); 309 ChromeExtensionsNetworkDelegate::Create(event_router));
309 } 310 }
310 311
311 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 312 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
312 313
313 void ChromeNetworkDelegate::set_extension_info_map( 314 void ChromeNetworkDelegate::set_extension_info_map(
314 extensions::InfoMap* extension_info_map) { 315 extensions::InfoMap* extension_info_map) {
315 extensions_delegate_->set_extension_info_map(extension_info_map); 316 extensions_delegate_->set_extension_info_map(extension_info_map);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 468
468 if (force_safe_search && rv == net::OK && new_url->is_empty()) 469 if (force_safe_search && rv == net::OK && new_url->is_empty())
469 ForceGoogleSafeSearch(request, new_url); 470 ForceGoogleSafeSearch(request, new_url);
470 471
471 if (connect_interceptor_) 472 if (connect_interceptor_)
472 connect_interceptor_->WitnessURLRequest(request); 473 connect_interceptor_->WitnessURLRequest(request);
473 474
474 return rv; 475 return rv;
475 } 476 }
476 477
478 void ChromeNetworkDelegate::OnResolveProxy(
479 const GURL& url, int load_flags, net::ProxyInfo* result) {
480 if (on_resolve_proxy_handler_)
481 on_resolve_proxy_handler_->Run(url, load_flags, result);
482 }
483
477 int ChromeNetworkDelegate::OnBeforeSendHeaders( 484 int ChromeNetworkDelegate::OnBeforeSendHeaders(
478 net::URLRequest* request, 485 net::URLRequest* request,
479 const net::CompletionCallback& callback, 486 const net::CompletionCallback& callback,
480 net::HttpRequestHeaders* headers) { 487 net::HttpRequestHeaders* headers) {
481 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest"); 488 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest");
482 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers); 489 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);
483 } 490 }
484 491
485 void ChromeNetworkDelegate::OnBeforeSendProxyHeaders( 492 void ChromeNetworkDelegate::OnBeforeSendProxyHeaders(
486 net::URLRequest* request, 493 net::URLRequest* request,
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 data_reduction_proxy::DataReductionProxyRequestType request_type) { 831 data_reduction_proxy::DataReductionProxyRequestType request_type) {
825 DCHECK_GE(received_content_length, 0); 832 DCHECK_GE(received_content_length, 0);
826 DCHECK_GE(original_content_length, 0); 833 DCHECK_GE(original_content_length, 0);
827 StoreAccumulatedContentLength(received_content_length, 834 StoreAccumulatedContentLength(received_content_length,
828 original_content_length, 835 original_content_length,
829 request_type, 836 request_type,
830 reinterpret_cast<Profile*>(profile_)); 837 reinterpret_cast<Profile*>(profile_));
831 received_content_length_ += received_content_length; 838 received_content_length_ += received_content_length;
832 original_content_length_ += original_content_length; 839 original_content_length_ += original_content_length;
833 } 840 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698