WIP: Prototype OOP V8 PAC.

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 "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/utility_process_host.h"
+#include "content/public/browser/utility_process_host_client.h"
+#include "content/public/common/service_registry.h"
 #include "net/base/net_log.h"
+#include "net/dns/host_resolver.mojom.h"
+#include "net/dns/host_resolver_mojo_host.h"
 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
+#include "net/proxy/network_delegate_error_observer.h"
 #include "net/proxy/proxy_config_service.h"
+#include "net/proxy/proxy_resolver.mojom.h"
+#include "net/proxy/proxy_resolver_error_observer_mojo_host.h"
+#include "net/proxy/proxy_resolver_mojo.h"
+#include "net/proxy/proxy_resolver_mojo_host.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/proxy/proxy_service_v8.h"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if !defined(OS_IOS)
 #include "net/proxy/proxy_resolver_v8.h"
 #endif
 
 using content::BrowserThread;
 
+namespace {
+
+net::ProxyService* CreateProxyServiceUsingMojo(
+    net::ProxyConfigService* proxy_config_service,
+    net::ProxyScriptFetcher* proxy_script_fetcher,
+    net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
+    net::HostResolver* host_resolver,
+    net::NetLog* net_log,
+    net::NetworkDelegate* network_delegate) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK(proxy_config_service);
+  DCHECK(proxy_script_fetcher);
+  DCHECK(dhcp_proxy_script_fetcher);
+  DCHECK(host_resolver);
+
+  content::UtilityProcessHost* utility_process_host;
+  utility_process_host = content::UtilityProcessHost::Create(
+       scoped_refptr<content::UtilityProcessHostClient>(),
+       base::MessageLoopProxy::current().get());
+  utility_process_host->StartMojoMode();
+  content::ServiceRegistry* service_registry =
+      utility_process_host->GetServiceRegistry();
+
+  net::proxy::ResolverFactoryPtr resolver_factory;
+  service_registry->ConnectToRemoteService(&resolver_factory);
+
+  net::proxy::ResolverPtr resolver_handle;
+  net::dns::ResolverPtr dns_resolver_handle;
+  net::proxy::ErrorObserverPtr error_observer_handle;
+  mojo::BindToProxy(new net::HostResolverMojoHost(host_resolver),
+                    &dns_resolver_handle);
+  mojo::BindToProxy(
+      new net::ProxyResolverErrorObserverMojoHost(
+          make_scoped_ptr(new net::NetworkDelegateErrorObserver(
+              network_delegate, base::MessageLoopProxy::current().get()))),
+      &error_observer_handle);
+
+  resolver_factory->CreateResolver(mojo::GetProxy(&resolver_handle),
+                                   dns_resolver_handle.Pass(),
+                                   error_observer_handle.Pass());
+
+  net::ProxyResolver* proxy_resolver =
+      new net::ProxyResolverMojo(resolver_handle.Pass(), host_resolver);
+
+  net::ProxyService* proxy_service =
+      new net::ProxyService(proxy_config_service, proxy_resolver, net_log);
+
+  // Configure fetchers to use for PAC script downloads and auto-detect.
+  proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
+                                        dhcp_proxy_script_fetcher);
+
+  return proxy_service;
+}
+
+}
+
 // static
 net::ProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(
     PrefProxyConfigTracker* tracker) {
   // The linux gconf-based proxy settings getter relies on being initialized
   // from the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<net::ProxyConfigService> base_service;
 
 #if !defined(OS_CHROMEOS)
@@ skipping 76 matching lines @@
     } else {
       LOG(ERROR) << "Invalid switch for number of PAC threads: " << s;
     }
   }
 
   net::ProxyService* proxy_service = NULL;
   if (use_v8) {
 #if defined(OS_IOS)
     NOTREACHED();
 #else
-    net::ProxyResolverV8::EnsureIsolateCreated();
-
     net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
 #if defined(OS_CHROMEOS)
     dhcp_proxy_script_fetcher =
         new chromeos::DhcpProxyScriptFetcherChromeos(context);
 #else
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
     dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
 #endif
 
-    proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
+    proxy_service = CreateProxyServiceUsingMojo(
         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(
         proxy_config_service,
         num_pac_threads,
         net_log);
   }
 
   proxy_service->set_quick_check_enabled(quick_check_enabled);
 
   return proxy_service;
 }