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

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

Issue 2945004: Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionError start... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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
« no previous file with comments | « net/proxy/proxy_resolver_v8_unittest.cc ('k') | net/proxy/proxy_service.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_SERVICE_H_ 5 #ifndef NET_PROXY_PROXY_SERVICE_H_
6 #define NET_PROXY_PROXY_SERVICE_H_ 6 #define NET_PROXY_PROXY_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 friend class PacRequest; 174 friend class PacRequest;
175 175
176 // TODO(eroman): change this to a std::set. Note that this requires updating 176 // TODO(eroman): change this to a std::set. Note that this requires updating
177 // some tests in proxy_service_unittest.cc such as: 177 // some tests in proxy_service_unittest.cc such as:
178 // ProxyServiceTest.InitialPACScriptDownload 178 // ProxyServiceTest.InitialPACScriptDownload
179 // which expects requests to finish in the order they were added. 179 // which expects requests to finish in the order they were added.
180 typedef std::vector<scoped_refptr<PacRequest> > PendingRequests; 180 typedef std::vector<scoped_refptr<PacRequest> > PendingRequests;
181 181
182 ~ProxyService(); 182 ~ProxyService();
183 183
184 // Creates a proxy resolver appropriate for this platform that doesn't rely
185 // on V8.
186 static ProxyResolver* CreateNonV8ProxyResolver();
187
184 // Identifies the proxy configuration. 188 // Identifies the proxy configuration.
185 ProxyConfig::ID config_id() const { return config_.id(); } 189 ProxyConfig::ID config_id() const { return config_.id(); }
186 190
187 // Checks to see if the proxy configuration changed, and then updates config_ 191 // Checks to see if the proxy configuration changed, and then updates config_
188 // to reference the new configuration. 192 // to reference the new configuration.
189 void UpdateConfig(const BoundNetLog& net_log); 193 void UpdateConfig(const BoundNetLog& net_log);
190 194
191 // Assign |config| as the current configuration. 195 // Assign |config| as the current configuration.
192 void SetConfig(const ProxyConfig& config); 196 void SetConfig(const ProxyConfig& config);
193 197
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 314
311 base::WaitableEvent event_; 315 base::WaitableEvent event_;
312 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; 316 CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
313 ProxyInfo proxy_info_; 317 ProxyInfo proxy_info_;
314 int result_; 318 int result_;
315 }; 319 };
316 320
317 } // namespace net 321 } // namespace net
318 322
319 #endif // NET_PROXY_PROXY_SERVICE_H_ 323 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698