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 6bb3f38e5f25d3746c17c1392a979869715eefe1..3e709f4aac9c070769d39a48a0b7994a6288675e 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; |
@@ -144,13 +145,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( |