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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 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
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 #ifndef NET_PROXY_PROXY_INFO_H_ 5 #ifndef NET_PROXY_PROXY_INFO_H_
6 #define NET_PROXY_PROXY_INFO_H_ 6 #define NET_PROXY_PROXY_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ProxyConfigSource config_source() const { return config_source_; } 134 ProxyConfigSource config_source() const { return config_source_; }
135 135
136 // See description in ProxyList::ToPacString(). 136 // See description in ProxyList::ToPacString().
137 std::string ToPacString() const; 137 std::string ToPacString() const;
138 138
139 // Marks the current proxy as bad. |net_error| should contain the network 139 // Marks the current proxy as bad. |net_error| should contain the network
140 // error encountered when this proxy was tried, if any. If this fallback 140 // error encountered when this proxy was tried, if any. If this fallback
141 // is not because of a network error, then |OK| should be passed in (eg. for 141 // is not because of a network error, then |OK| should be passed in (eg. for
142 // reasons such as local policy). Returns true if there is another proxy is 142 // reasons such as local policy). Returns true if there is another proxy is
143 // available to try in proxy list_. 143 // available to try in proxy list_.
144 bool Fallback(int net_error, const BoundNetLog& net_log); 144 bool Fallback(int net_error, const NetLogWithSource& net_log);
145 145
146 // De-prioritizes the proxies that we have cached as not working, by moving 146 // De-prioritizes the proxies that we have cached as not working, by moving
147 // them to the end of the proxy list. 147 // them to the end of the proxy list.
148 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info); 148 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info);
149 149
150 // Deletes any entry which doesn't have one of the specified proxy schemes. 150 // Deletes any entry which doesn't have one of the specified proxy schemes.
151 void RemoveProxiesWithoutScheme(int scheme_bit_field); 151 void RemoveProxiesWithoutScheme(int scheme_bit_field);
152 152
153 ProxyConfig::ID config_id() const { return config_id_; } 153 ProxyConfig::ID config_id() const { return config_id_; }
154 154
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 197
198 // How long it took to resolve the proxy. Times are both null if proxy was 198 // How long it took to resolve the proxy. Times are both null if proxy was
199 // determined synchronously without running a PAC. 199 // determined synchronously without running a PAC.
200 base::TimeTicks proxy_resolve_start_time_; 200 base::TimeTicks proxy_resolve_start_time_;
201 base::TimeTicks proxy_resolve_end_time_; 201 base::TimeTicks proxy_resolve_end_time_;
202 }; 202 };
203 203
204 } // namespace net 204 } // namespace net
205 205
206 #endif // NET_PROXY_PROXY_INFO_H_ 206 #endif // NET_PROXY_PROXY_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698