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

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

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « net/proxy/proxy_config_unittest.cc ('k') | net/proxy/proxy_info_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/time/time.h" 10 #include "base/time/time.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // De-prioritizes the proxies that we have cached as not working, by moving 125 // De-prioritizes the proxies that we have cached as not working, by moving
126 // them to the end of the proxy list. 126 // them to the end of the proxy list.
127 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info); 127 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info);
128 128
129 // Deletes any entry which doesn't have one of the specified proxy schemes. 129 // Deletes any entry which doesn't have one of the specified proxy schemes.
130 void RemoveProxiesWithoutScheme(int scheme_bit_field); 130 void RemoveProxiesWithoutScheme(int scheme_bit_field);
131 131
132 ProxyConfig::ID config_id() const { return config_id_; } 132 ProxyConfig::ID config_id() const { return config_id_; }
133 133
134 // Returns the list of proxies to use.
135 const ProxyList& proxy_list() const {
136 return proxy_list_;
137 }
138
134 base::TimeTicks proxy_resolve_start_time() const { 139 base::TimeTicks proxy_resolve_start_time() const {
135 return proxy_resolve_start_time_; 140 return proxy_resolve_start_time_;
136 } 141 }
137 142
138 base::TimeTicks proxy_resolve_end_time() const { 143 base::TimeTicks proxy_resolve_end_time() const {
139 return proxy_resolve_end_time_; 144 return proxy_resolve_end_time_;
140 } 145 }
141 146
142 private: 147 private:
143 friend class ProxyService; 148 friend class ProxyService;
(...skipping 26 matching lines...) Expand all
170 175
171 // How long it took to resolve the proxy. Times are both null if proxy was 176 // How long it took to resolve the proxy. Times are both null if proxy was
172 // determined synchronously without running a PAC. 177 // determined synchronously without running a PAC.
173 base::TimeTicks proxy_resolve_start_time_; 178 base::TimeTicks proxy_resolve_start_time_;
174 base::TimeTicks proxy_resolve_end_time_; 179 base::TimeTicks proxy_resolve_end_time_;
175 }; 180 };
176 181
177 } // namespace net 182 } // namespace net
178 183
179 #endif // NET_PROXY_PROXY_INFO_H_ 184 #endif // NET_PROXY_PROXY_INFO_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_unittest.cc ('k') | net/proxy/proxy_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698