Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1754)

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 940813003: Use a utility process for the Mojo v8 proxy resolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-in-process-enable
Patch Set: Add browser test Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f5db798d6b267d19d5bd225bbc915139966d8cb5..40c5b32e7ebe03013567a9853f0177f0adc3063d 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"
@@ -11,6 +13,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
+#include "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/net_log.h"
@@ -137,7 +140,14 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
#endif
- 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,

Powered by Google App Engine
This is Rietveld 408576698