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

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

Issue 2625853002: Remove --v8-pac-mojo-in-process (Closed)
Patch Set: test Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e00888dbe64ec90541466288d71fe2fd098601f5..a3e64a5ea49432f8c239be48534ee73ffb5f5e50 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -159,15 +159,7 @@ std::unique_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
#endif
#if !defined(OS_ANDROID)
- // In-process Mojo PAC can only be set on the command line, so its presence
- // should override other options.
- if (command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
- proxy_service = net::CreateProxyServiceUsingMojoInProcess(
- std::move(proxy_config_service),
- new net::ProxyScriptFetcherImpl(context),
- std::move(dhcp_proxy_script_fetcher), context->host_resolver(),
- net_log, network_delegate);
- } else if (EnableOutOfProcessV8Pac(command_line)) {
+ if (EnableOutOfProcessV8Pac(command_line)) {
proxy_service = net::CreateProxyServiceUsingMojoFactory(
UtilityProcessMojoProxyResolverFactory::GetInstance(),
std::move(proxy_config_service),
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698