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

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

Issue 910343003: Create an in-process v8 proxy resolver using Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-complete-patch
Patch Set: Address review comments. Created 5 years, 10 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 87c1f290b30e677f4c7f983aa9f0e4d0ef6182bd..f5db798d6b267d19d5bd225bbc915139966d8cb5 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -28,6 +28,7 @@
#if !defined(OS_IOS)
#include "net/proxy/proxy_resolver_v8.h"
+#include "net/proxy/proxy_service_mojo.h"
#endif
using content::BrowserThread;
@@ -136,13 +137,17 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
#endif
- proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
- proxy_config_service,
- new net::ProxyScriptFetcherImpl(context),
- dhcp_proxy_script_fetcher,
- context->host_resolver(),
- net_log,
- network_delegate);
+ 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,
+ network_delegate);
+ } else {
+ proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
+ proxy_config_service, new net::ProxyScriptFetcherImpl(context),
+ dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
+ network_delegate);
+ }
#endif // defined(OS_IOS)
} else {
proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(

Powered by Google App Engine
This is Rietveld 408576698