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

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

Issue 2930743002: Use a MojoProxyResolverFactory on Android. (Closed)
Patch Set: Uninteresting merge Created 3 years, 6 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 c08f38228686c665800cf96717379ba06f703c95..dcb7c5c30e9e139b941efd82e51e6d42d84db7b7 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -15,16 +15,16 @@
#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)
@@ -32,11 +32,6 @@
#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
@@ -128,20 +123,12 @@ std::unique_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
#endif
-#if !defined(OS_ANDROID)
proxy_service = net::CreateProxyServiceUsingMojoFactory(
- UtilityProcessMojoProxyResolverFactory::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(
+ ChromeMojoProxyResolverFactory::GetInstance(),
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);

Powered by Google App Engine
This is Rietveld 408576698