| 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 "net/proxy/proxy_info.h" | 5 #include "net/proxy/proxy_info.h" |
| 6 | 6 |
| 7 #include "net/proxy/proxy_retry_info.h" | 7 #include "net/proxy/proxy_retry_info.h" |
| 8 | 8 |
| 9 namespace net { | 9 namespace net { |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 } | 62 } |
| 63 | 63 |
| 64 void ProxyInfo::OverrideProxyList(const ProxyList& proxy_list) { | 64 void ProxyInfo::OverrideProxyList(const ProxyList& proxy_list) { |
| 65 proxy_list_ = proxy_list; | 65 proxy_list_ = proxy_list; |
| 66 } | 66 } |
| 67 | 67 |
| 68 std::string ProxyInfo::ToPacString() const { | 68 std::string ProxyInfo::ToPacString() const { |
| 69 return proxy_list_.ToPacString(); | 69 return proxy_list_.ToPacString(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 bool ProxyInfo::Fallback(int net_error, const BoundNetLog& net_log) { | 72 bool ProxyInfo::Fallback(int net_error, const NetLogWithSource& net_log) { |
| 73 return proxy_list_.Fallback(&proxy_retry_info_, net_error, net_log); | 73 return proxy_list_.Fallback(&proxy_retry_info_, net_error, net_log); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void ProxyInfo::DeprioritizeBadProxies( | 76 void ProxyInfo::DeprioritizeBadProxies( |
| 77 const ProxyRetryInfoMap& proxy_retry_info) { | 77 const ProxyRetryInfoMap& proxy_retry_info) { |
| 78 proxy_list_.DeprioritizeBadProxies(proxy_retry_info); | 78 proxy_list_.DeprioritizeBadProxies(proxy_retry_info); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) { | 81 void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) { |
| 82 proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field); | 82 proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ProxyInfo::Reset() { | 85 void ProxyInfo::Reset() { |
| 86 proxy_resolve_start_time_ = base::TimeTicks(); | 86 proxy_resolve_start_time_ = base::TimeTicks(); |
| 87 proxy_resolve_end_time_ = base::TimeTicks(); | 87 proxy_resolve_end_time_ = base::TimeTicks(); |
| 88 proxy_list_.Clear(); | 88 proxy_list_.Clear(); |
| 89 proxy_retry_info_.clear(); | 89 proxy_retry_info_.clear(); |
| 90 config_id_ = ProxyConfig::kInvalidConfigID; | 90 config_id_ = ProxyConfig::kInvalidConfigID; |
| 91 config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN; | 91 config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN; |
| 92 did_bypass_proxy_ = false; | 92 did_bypass_proxy_ = false; |
| 93 did_use_pac_script_ = false; | 93 did_use_pac_script_ = false; |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace net | 96 } // namespace net |
| OLD | NEW |