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 "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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 | 442 |
443 void ChromeNetworkDelegate::OnResolveProxy( | 443 void ChromeNetworkDelegate::OnResolveProxy( |
444 const GURL& url, | 444 const GURL& url, |
445 int load_flags, | 445 int load_flags, |
446 const net::ProxyService& proxy_service, | 446 const net::ProxyService& proxy_service, |
447 net::ProxyInfo* result) { | 447 net::ProxyInfo* result) { |
448 if (!on_resolve_proxy_handler_.is_null() && | 448 if (!on_resolve_proxy_handler_.is_null() && |
449 !proxy_config_getter_.is_null()) { | 449 !proxy_config_getter_.is_null()) { |
450 on_resolve_proxy_handler_.Run(url, load_flags, | 450 on_resolve_proxy_handler_.Run(url, load_flags, |
451 proxy_config_getter_.Run(), | 451 proxy_config_getter_.Run(), |
| 452 proxy_service.config(), |
452 proxy_service.proxy_retry_info(), | 453 proxy_service.proxy_retry_info(), |
453 data_reduction_proxy_params_, result); | 454 data_reduction_proxy_params_, result); |
454 } | 455 } |
455 } | 456 } |
456 | 457 |
457 void ChromeNetworkDelegate::OnProxyFallback(const net::ProxyServer& bad_proxy, | 458 void ChromeNetworkDelegate::OnProxyFallback(const net::ProxyServer& bad_proxy, |
458 int net_error) { | 459 int net_error) { |
459 if (data_reduction_proxy_usage_stats_) { | 460 if (data_reduction_proxy_usage_stats_) { |
460 data_reduction_proxy_usage_stats_->OnProxyFallback( | 461 data_reduction_proxy_usage_stats_->OnProxyFallback( |
461 bad_proxy, net_error); | 462 bad_proxy, net_error); |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
828 if (data_reduction_proxy_statistics_prefs_) { | 829 if (data_reduction_proxy_statistics_prefs_) { |
829 StoreAccumulatedContentLength(received_content_length, | 830 StoreAccumulatedContentLength(received_content_length, |
830 original_content_length, | 831 original_content_length, |
831 request_type, | 832 request_type, |
832 reinterpret_cast<Profile*>(profile_), | 833 reinterpret_cast<Profile*>(profile_), |
833 data_reduction_proxy_statistics_prefs_); | 834 data_reduction_proxy_statistics_prefs_); |
834 } | 835 } |
835 received_content_length_ += received_content_length; | 836 received_content_length_ += received_content_length; |
836 original_content_length_ += original_content_length; | 837 original_content_length_ += original_content_length; |
837 } | 838 } |
OLD | NEW |