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

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 940813003: Use a utility process for the Mojo v8 proxy resolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-in-process-enable
Patch Set: Remove unneeded forward decl. Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index c30fab86cc9b99c61bd2fa2397b0206f6544fc7c..8bef0a8f4d70baae6d5ba44e252d01a93b9d2689 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/net/proxy_service_factory.h"
+#include <string>
+
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread.h"
@@ -30,6 +32,7 @@
#endif
#if !defined(OS_IOS) && !defined(OS_ANDROID)
+#include "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h"
#include "net/proxy/proxy_service_mojo.h"
#endif
@@ -134,7 +137,13 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
#endif
#if !defined(OS_ANDROID)
- if (command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
+ if (command_line.HasSwitch(switches::kV8PacMojoOutOfProcess)) {
+ proxy_service = net::CreateProxyServiceUsingMojoFactory(
+ UtilityProcessMojoProxyResolverFactory::GetInstance(),
+ proxy_config_service, new net::ProxyScriptFetcherImpl(context),
+ dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
+ network_delegate);
+ } else if (command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
proxy_service = net::CreateProxyServiceUsingMojoInProcess(
proxy_config_service, new net::ProxyScriptFetcherImpl(context),
dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
« no previous file with comments | « chrome/browser/net/proxy_browsertest.cc ('k') | chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698