Embed a simple Mojo shell in content

chrome/browser/net/proxy_service_factory.cc

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 96293f8a816a13186e58d7cb35d52b1e2be102ed..3b1f7b161d1bbab91c5ce7ce3e5c530bd5b8c790 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -32,7 +32,7 @@
 #endif
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
-#include "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h"
+#include "chrome/browser/net/mojo_app_proxy_resolver_factory.h"
 #include "net/proxy/proxy_service_mojo.h"
 #endif
 
@@ -144,17 +144,12 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
 #endif
 
 #if !defined(OS_ANDROID)
-    if (command_line.HasSwitch(switches::kV8PacMojoOutOfProcess)) {
+    if (command_line.HasSwitch(switches::kV8PacMojoOutOfProcess) ||
+        command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
       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,
-          network_delegate);
+          MojoAppProxyResolverFactory::GetInstance(), proxy_config_service,
+          new net::ProxyScriptFetcherImpl(context), dhcp_proxy_script_fetcher,
+          context->host_resolver(), net_log, network_delegate);
     }
 #endif  // !defined(OS_ANDROID)