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

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

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: callback design (not yet done) Created 6 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
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_v8.h" 5 #include "net/proxy/proxy_service_v8.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/proxy/network_delegate_error_observer.h" 8 #include "net/proxy/network_delegate_error_observer.h"
9 #include "net/proxy/proxy_resolver.h" 9 #include "net/proxy/proxy_resolver.h"
10 #include "net/proxy/proxy_resolver_v8_tracing.h" 10 #include "net/proxy/proxy_resolver_v8_tracing.h"
(...skipping 14 matching lines...) Expand all
25 DCHECK(dhcp_proxy_script_fetcher); 25 DCHECK(dhcp_proxy_script_fetcher);
26 DCHECK(host_resolver); 26 DCHECK(host_resolver);
27 27
28 ProxyResolverErrorObserver* error_observer = new NetworkDelegateErrorObserver( 28 ProxyResolverErrorObserver* error_observer = new NetworkDelegateErrorObserver(
29 network_delegate, base::MessageLoopProxy::current().get()); 29 network_delegate, base::MessageLoopProxy::current().get());
30 30
31 ProxyResolver* proxy_resolver = 31 ProxyResolver* proxy_resolver =
32 new ProxyResolverV8Tracing(host_resolver, error_observer, net_log); 32 new ProxyResolverV8Tracing(host_resolver, error_observer, net_log);
33 33
34 ProxyService* proxy_service = 34 ProxyService* proxy_service =
35 new ProxyService(proxy_config_service, proxy_resolver, net_log); 35 new ProxyService(proxy_config_service, proxy_resolver,
36 network_delegate, net_log);
36 37
37 // Configure fetchers to use for PAC script downloads and auto-detect. 38 // Configure fetchers to use for PAC script downloads and auto-detect.
38 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, 39 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
39 dhcp_proxy_script_fetcher); 40 dhcp_proxy_script_fetcher);
40 41
41 return proxy_service; 42 return proxy_service;
42 } 43 }
43 44
44 } // namespace net 45 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698