Use a MojoProxyResolverFactory on Android.

chrome/browser/net/proxy_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/proxy_service_factory.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
+#include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
 #include "net/proxy/proxy_config_service.h"
-#include "net/proxy/proxy_resolver_v8.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
-#include "net/proxy/proxy_service_v8.h"
+#include "net/proxy/proxy_service_mojo.h"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h"
 #include "chromeos/network/proxy/proxy_config_service_impl.h"
 #endif  // defined(OS_CHROMEOS)
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h"
-#include "net/proxy/proxy_service_mojo.h"
-#endif
-
 using content::BrowserThread;
 
 // static
 std::unique_ptr<net::ProxyConfigService>
 ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
   // The linux gconf-based proxy settings getter relies on being initialized
   // from the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::unique_ptr<net::ProxyConfigService> base_service;
@@ skipping 71 matching lines @@
   if (use_v8) {
     std::unique_ptr<net::DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher;
 #if defined(OS_CHROMEOS)
     dhcp_proxy_script_fetcher.reset(
         new chromeos::DhcpProxyScriptFetcherChromeos(context));
 #else
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
     dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
 #endif
 
-#if !defined(OS_ANDROID)
     proxy_service = net::CreateProxyServiceUsingMojoFactory(
-        UtilityProcessMojoProxyResolverFactory::GetInstance(),
+        ChromeMojoProxyResolverFactory::GetInstance(),
         std::move(proxy_config_service),
         new net::ProxyScriptFetcherImpl(context),
         std::move(dhcp_proxy_script_fetcher), context->host_resolver(), net_log,
         network_delegate);
-#else
-    proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
-        std::move(proxy_config_service),
-        new net::ProxyScriptFetcherImpl(context),
-        std::move(dhcp_proxy_script_fetcher), context->host_resolver(), net_log,
-        network_delegate);
-#endif  // !defined(OS_ANDROID)
   } else {
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
         std::move(proxy_config_service), net_log);
   }
 
   proxy_service->set_quick_check_enabled(quick_check_enabled);
   proxy_service->set_sanitize_url_policy(
       pac_https_url_stripping_enabled
           ? net::ProxyService::SanitizeUrlPolicy::SAFE
           : net::ProxyService::SanitizeUrlPolicy::UNSAFE);
 
   return proxy_service;
 }