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

Side by Side Diff: net/proxy/proxy_info.cc

Issue 10987043: Receiving Connection: Proxy-Bypass induces proxy fallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pull proxy list mutation in ProxyService. Created 8 years, 2 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 | Annotate | Revision Log
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 "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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 std::string ProxyInfo::ToPacString() const { 50 std::string ProxyInfo::ToPacString() const {
51 return proxy_list_.ToPacString(); 51 return proxy_list_.ToPacString();
52 } 52 }
53 53
54 bool ProxyInfo::Fallback(const BoundNetLog& net_log) { 54 bool ProxyInfo::Fallback(const BoundNetLog& net_log) {
55 return proxy_list_.Fallback(&proxy_retry_info_, net_log); 55 return proxy_list_.Fallback(&proxy_retry_info_, net_log);
56 } 56 }
57 57
58 bool ProxyInfo::Fallback(ProxyRetryInfoMap& proxy_retry_info,
59 const BoundNetLog& net_log) {
60 return proxy_list_.Fallback(&proxy_retry_info, net_log);
61 }
62
58 void ProxyInfo::DeprioritizeBadProxies( 63 void ProxyInfo::DeprioritizeBadProxies(
59 const ProxyRetryInfoMap& proxy_retry_info) { 64 const ProxyRetryInfoMap& proxy_retry_info) {
60 proxy_list_.DeprioritizeBadProxies(proxy_retry_info); 65 proxy_list_.DeprioritizeBadProxies(proxy_retry_info);
61 } 66 }
62 67
63 void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) { 68 void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) {
64 proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field); 69 proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field);
65 } 70 }
66 71
67 void ProxyInfo::Reset() { 72 void ProxyInfo::Reset() {
68 proxy_list_.Clear(); 73 proxy_list_.Clear();
69 proxy_retry_info_.clear(); 74 proxy_retry_info_.clear();
70 config_id_ = ProxyConfig::kInvalidConfigID; 75 config_id_ = ProxyConfig::kInvalidConfigID;
71 config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN; 76 config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN;
72 did_bypass_proxy_ = false; 77 did_bypass_proxy_ = false;
73 did_use_pac_script_ = false; 78 did_use_pac_script_ = false;
74 } 79 }
75 80
76 } // namespace net 81 } // namespace net
OLDNEW
« net/proxy/proxy_info.h ('K') | « net/proxy/proxy_info.h ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698