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

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

Issue 1126513002: Add ProxyResolverFactoryV8Tracing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-proxy-refactor
Patch Set: Created 5 years, 7 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 "base/threading/thread_checker.h" 8 #include "base/threading/thread_checker.h"
9 #include "net/proxy/network_delegate_error_observer.h" 9 #include "net/proxy/network_delegate_error_observer.h"
10 #include "net/proxy/proxy_resolver.h" 10 #include "net/proxy/proxy_resolver.h"
11 #include "net/proxy/proxy_resolver_factory.h" 11 #include "net/proxy/proxy_resolver_factory.h"
12 #include "net/proxy/proxy_resolver_v8_tracing.h" 12 #include "net/proxy/proxy_resolver_v8_tracing.h"
13 #include "net/proxy/proxy_service.h" 13 #include "net/proxy/proxy_service.h"
14 14
15 namespace net { 15 namespace net {
16 namespace { 16 namespace {
17 17
18 class ProxyResolverFactoryForV8Resolver : public LegacyProxyResolverFactory { 18 class ProxyResolverFactoryForV8Resolver : public ProxyResolverFactoryV8Tracing {
19 public: 19 public:
20 explicit ProxyResolverFactoryForV8Resolver(HostResolver* host_resolver, 20 explicit ProxyResolverFactoryForV8Resolver(HostResolver* host_resolver,
21 NetLog* net_log, 21 NetLog* net_log,
22 NetworkDelegate* network_delegate) 22 NetworkDelegate* network_delegate)
23 : LegacyProxyResolverFactory(true), 23 : ProxyResolverFactoryV8Tracing(
24 host_resolver_(host_resolver), 24 host_resolver,
25 net_log_(net_log), 25 net_log,
26 ProxyResolver::LoadStateChangedCallback()),
26 network_delegate_(network_delegate) {} 27 network_delegate_(network_delegate) {}
27 28
28 // LegacyProxyResolverFactory override. 29 // ProxyResolverFactory override.
29 scoped_ptr<ProxyResolver> CreateProxyResolver() override { 30 scoped_ptr<ProxyResolverErrorObserver> CreateErrorObserver() override {
30 DCHECK(thread_checker_.CalledOnValidThread()); 31 DCHECK(thread_checker_.CalledOnValidThread());
31 ProxyResolverErrorObserver* error_observer = 32 return make_scoped_ptr(new NetworkDelegateErrorObserver(
32 new NetworkDelegateErrorObserver( 33 network_delegate_, base::MessageLoopProxy::current().get()));
33 network_delegate_, base::MessageLoopProxy::current().get());
34 return make_scoped_ptr(
35 new ProxyResolverV8Tracing(host_resolver_, error_observer, net_log_));
36 } 34 }
37 35
38 private: 36 private:
39 HostResolver* const host_resolver_;
40 NetLog* const net_log_;
41 NetworkDelegate* const network_delegate_; 37 NetworkDelegate* const network_delegate_;
42 38
43 base::ThreadChecker thread_checker_; 39 base::ThreadChecker thread_checker_;
44 40
45 DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactoryForV8Resolver); 41 DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactoryForV8Resolver);
46 }; 42 };
47 } // namespace 43 } // namespace
48 44
49 // static 45 // static
50 ProxyService* CreateProxyServiceUsingV8ProxyResolver( 46 ProxyService* CreateProxyServiceUsingV8ProxyResolver(
(...skipping 15 matching lines...) Expand all
66 net_log); 62 net_log);
67 63
68 // Configure fetchers to use for PAC script downloads and auto-detect. 64 // Configure fetchers to use for PAC script downloads and auto-detect.
69 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, 65 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
70 dhcp_proxy_script_fetcher); 66 dhcp_proxy_script_fetcher);
71 67
72 return proxy_service; 68 return proxy_service;
73 } 69 }
74 70
75 } // namespace net 71 } // namespace net
OLDNEW
« net/proxy/proxy_resolver_v8_tracing.cc ('K') | « net/proxy/proxy_resolver_v8_tracing_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698