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

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

Issue 1128453004: Embed a simple Mojo shell in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_mojo.h" 5 #include "net/proxy/proxy_service_mojo.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/dns/host_resolver_mojo.h" 8 #include "net/dns/host_resolver_mojo.h"
9 #include "net/interfaces/proxy_resolver_service.mojom.h" 9 #include "net/interfaces/proxy_resolver_service.mojom.h"
10 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h"
11 #include "net/proxy/mojo_proxy_resolver_impl.h" 10 #include "net/proxy/mojo_proxy_resolver_impl.h"
12 #include "net/proxy/proxy_resolver_factory.h" 11 #include "net/proxy/proxy_resolver_factory.h"
13 #include "net/proxy/proxy_resolver_mojo.h" 12 #include "net/proxy/proxy_resolver_mojo.h"
14 #include "net/proxy/proxy_resolver_v8_tracing.h" 13 #include "net/proxy/proxy_resolver_v8_tracing.h"
15 #include "net/proxy/proxy_service.h" 14 #include "net/proxy/proxy_service.h"
16 15
17 namespace net { 16 namespace net {
18 17
19 ProxyService* CreateProxyServiceUsingMojoFactory( 18 ProxyService* CreateProxyServiceUsingMojoFactory(
20 interfaces::ProxyResolverFactory* mojo_proxy_factory, 19 interfaces::ProxyResolverFactory* mojo_proxy_factory,
(...skipping 13 matching lines...) Expand all
34 mojo_proxy_factory, host_resolver)), 33 mojo_proxy_factory, host_resolver)),
35 net_log); 34 net_log);
36 35
37 // Configure fetchers to use for PAC script downloads and auto-detect. 36 // Configure fetchers to use for PAC script downloads and auto-detect.
38 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, 37 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
39 dhcp_proxy_script_fetcher); 38 dhcp_proxy_script_fetcher);
40 39
41 return proxy_service; 40 return proxy_service;
42 } 41 }
43 42
44 ProxyService* CreateProxyServiceUsingMojoInProcess(
45 ProxyConfigService* proxy_config_service,
46 ProxyScriptFetcher* proxy_script_fetcher,
47 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
48 HostResolver* host_resolver,
49 NetLog* net_log,
50 NetworkDelegate* network_delegate) {
51 return CreateProxyServiceUsingMojoFactory(
52 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service,
53 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log,
54 network_delegate);
55 }
56
57 } // namespace net 43 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698