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

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

Issue 11885009: Improve performance of proxy resolver by tracing DNS dependencies. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: that's what she said Created 7 years, 11 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 #include "net/proxy/proxy_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 10 matching lines...) Expand all
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/base/net_log.h" 22 #include "net/base/net_log.h"
23 #include "net/base/net_util.h" 23 #include "net/base/net_util.h"
24 #include "net/proxy/dhcp_proxy_script_fetcher.h" 24 #include "net/proxy/dhcp_proxy_script_fetcher.h"
25 #include "net/proxy/multi_threaded_proxy_resolver.h" 25 #include "net/proxy/multi_threaded_proxy_resolver.h"
26 #include "net/proxy/network_delegate_error_observer.h" 26 #include "net/proxy/network_delegate_error_observer.h"
27 #include "net/proxy/proxy_config_service_fixed.h" 27 #include "net/proxy/proxy_config_service_fixed.h"
28 #include "net/proxy/proxy_resolver.h" 28 #include "net/proxy/proxy_resolver.h"
29 #include "net/proxy/proxy_script_decider.h" 29 #include "net/proxy/proxy_script_decider.h"
30 #include "net/proxy/proxy_script_fetcher.h" 30 #include "net/proxy/proxy_script_fetcher.h"
31 #include "net/proxy/sync_host_resolver_bridge.h"
32 #include "net/url_request/url_request_context.h" 31 #include "net/url_request/url_request_context.h"
33 32
34 #if defined(OS_WIN) 33 #if defined(OS_WIN)
35 #include "net/proxy/proxy_config_service_win.h" 34 #include "net/proxy/proxy_config_service_win.h"
36 #include "net/proxy/proxy_resolver_winhttp.h" 35 #include "net/proxy/proxy_resolver_winhttp.h"
37 #elif defined(OS_IOS) 36 #elif defined(OS_IOS)
38 #include "net/proxy/proxy_config_service_ios.h" 37 #include "net/proxy/proxy_config_service_ios.h"
39 #include "net/proxy/proxy_resolver_mac.h" 38 #include "net/proxy/proxy_resolver_mac.h"
40 #elif defined(OS_MACOSX) 39 #elif defined(OS_MACOSX)
41 #include "net/proxy/proxy_config_service_mac.h" 40 #include "net/proxy/proxy_config_service_mac.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 187
189 virtual void CancelRequest(RequestHandle request) OVERRIDE { 188 virtual void CancelRequest(RequestHandle request) OVERRIDE {
190 NOTREACHED(); 189 NOTREACHED();
191 } 190 }
192 191
193 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { 192 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
194 NOTREACHED(); 193 NOTREACHED();
195 return LOAD_STATE_IDLE; 194 return LOAD_STATE_IDLE;
196 } 195 }
197 196
198 virtual LoadState GetLoadStateThreadSafe(
199 RequestHandle request) const OVERRIDE {
200 NOTREACHED();
201 return LOAD_STATE_IDLE;
202 }
203
204 virtual void CancelSetPacScript() OVERRIDE { 197 virtual void CancelSetPacScript() OVERRIDE {
205 NOTREACHED(); 198 NOTREACHED();
206 } 199 }
207 200
208 virtual int SetPacScript( 201 virtual int SetPacScript(
209 const scoped_refptr<ProxyResolverScriptData>& /*script_data*/, 202 const scoped_refptr<ProxyResolverScriptData>& /*script_data*/,
210 const CompletionCallback& /*callback*/) OVERRIDE { 203 const CompletionCallback& /*callback*/) OVERRIDE {
211 return ERR_NOT_IMPLEMENTED; 204 return ERR_NOT_IMPLEMENTED;
212 } 205 }
213 }; 206 };
(...skipping 17 matching lines...) Expand all
231 224
232 virtual void CancelRequest(RequestHandle request) OVERRIDE { 225 virtual void CancelRequest(RequestHandle request) OVERRIDE {
233 NOTREACHED(); 226 NOTREACHED();
234 } 227 }
235 228
236 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { 229 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
237 NOTREACHED(); 230 NOTREACHED();
238 return LOAD_STATE_IDLE; 231 return LOAD_STATE_IDLE;
239 } 232 }
240 233
241 virtual LoadState GetLoadStateThreadSafe(
242 RequestHandle request) const OVERRIDE {
243 NOTREACHED();
244 return LOAD_STATE_IDLE;
245 }
246
247 virtual void CancelSetPacScript() OVERRIDE { 234 virtual void CancelSetPacScript() OVERRIDE {
248 NOTREACHED(); 235 NOTREACHED();
249 } 236 }
250 237
251 virtual int SetPacScript( 238 virtual int SetPacScript(
252 const scoped_refptr<ProxyResolverScriptData>& pac_script, 239 const scoped_refptr<ProxyResolverScriptData>& pac_script,
253 const CompletionCallback& callback) OVERRIDE { 240 const CompletionCallback& callback) OVERRIDE {
254 return OK; 241 return OK;
255 } 242 }
256 243
(...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 OnCompletion(result_); 1554 OnCompletion(result_);
1568 } 1555 }
1569 } 1556 }
1570 1557
1571 void SyncProxyServiceHelper::OnCompletion(int rv) { 1558 void SyncProxyServiceHelper::OnCompletion(int rv) {
1572 result_ = rv; 1559 result_ = rv;
1573 event_.Signal(); 1560 event_.Signal();
1574 } 1561 }
1575 1562
1576 } // namespace net 1563 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698