summaryrefslogtreecommitdiffstats
path: root/net/proxy/in_process_mojo_proxy_resolver_factory.cc
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2015-05-04 22:06:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-05 05:07:09 +0000
commit1d5df4d2c461802b42ce92fcab3ae5450890b1dc (patch)
tree8d8866c7e7b3fa5c92fc3b60163b37a5aa660083 /net/proxy/in_process_mojo_proxy_resolver_factory.cc
parentd0267003b17cf00dede1cb508e31ef31c473febf (diff)
downloadchromium_src-1d5df4d2c461802b42ce92fcab3ae5450890b1dc.zip
chromium_src-1d5df4d2c461802b42ce92fcab3ae5450890b1dc.tar.gz
chromium_src-1d5df4d2c461802b42ce92fcab3ae5450890b1dc.tar.bz2
Shut down proxy resolver utility processes when no longer needed.
This adds tracking of ProxyResolverMojo instances in the browser process when running with an out-of-process v8 proxy resolver. When no longer needed, the utility process is shut down following an idle timeout. BUG=467832 Review URL: https://codereview.chromium.org/1076083002 Cr-Commit-Position: refs/heads/master@{#328279}
Diffstat (limited to 'net/proxy/in_process_mojo_proxy_resolver_factory.cc')
-rw-r--r--net/proxy/in_process_mojo_proxy_resolver_factory.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/proxy/in_process_mojo_proxy_resolver_factory.cc b/net/proxy/in_process_mojo_proxy_resolver_factory.cc
index 47983c0..b38a093 100644
--- a/net/proxy/in_process_mojo_proxy_resolver_factory.cc
+++ b/net/proxy/in_process_mojo_proxy_resolver_factory.cc
@@ -25,13 +25,15 @@ InProcessMojoProxyResolverFactory::InProcessMojoProxyResolverFactory() {
InProcessMojoProxyResolverFactory::~InProcessMojoProxyResolverFactory() =
default;
-void InProcessMojoProxyResolverFactory::CreateResolver(
+scoped_ptr<base::ScopedClosureRunner>
+InProcessMojoProxyResolverFactory::CreateResolver(
const mojo::String& pac_script,
mojo::InterfaceRequest<interfaces::ProxyResolver> req,
interfaces::HostResolverPtr host_resolver,
interfaces::ProxyResolverFactoryRequestClientPtr client) {
factory_->CreateResolver(pac_script, req.Pass(), host_resolver.Pass(),
client.Pass());
+ return nullptr;
}
} // namespace net