| 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 a47409f53c4a7e5f4c058a7d1fb721e4af865442..4fdb449ab535f5bcf6cdc53ead54ad8a1bd9b01c 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/profiler/scoped_tracker.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -31,6 +33,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
|
|
|
| @@ -141,7 +144,14 @@ 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(
|
| + chrome_browser_net::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,
|
|
|