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

Unified Diff: net/url_request/url_request_context_builder_v8.cc

Issue 2888043008: Revert of Allow use of Mojo/V8 ProxyResolvers with URLRequestContextBuilder. (Closed)
Patch Set: Created 3 years, 7 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: net/url_request/url_request_context_builder_v8.cc
diff --git a/net/url_request/url_request_context_builder_v8.cc b/net/url_request/url_request_context_builder_v8.cc
deleted file mode 100644
index d16f4d750fefc2952286c0e94220698154056238..0000000000000000000000000000000000000000
--- a/net/url_request/url_request_context_builder_v8.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2017 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 "net/url_request/url_request_context_builder_v8.h"
-
-#include "base/logging.h"
-#include "net/proxy/proxy_config_service.h"
-#include "net/proxy/proxy_script_fetcher_impl.h"
-#include "net/proxy/proxy_service_v8.h"
-
-#ifdef ENABLE_NET_MOJO
-#include "net/proxy/proxy_service_mojo.h"
-#endif
-
-namespace net {
-
-URLRequestContextBuilderV8::URLRequestContextBuilderV8()
- : dhcp_fetcher_factory_(new DhcpProxyScriptFetcherFactory()) {}
-
-URLRequestContextBuilderV8::~URLRequestContextBuilderV8() = default;
-
-std::unique_ptr<ProxyService> URLRequestContextBuilderV8::CreateProxyService(
- std::unique_ptr<ProxyConfigService> proxy_config_service,
- URLRequestContext* url_request_context,
- HostResolver* host_resolver,
- NetworkDelegate* network_delegate,
- NetLog* net_log) {
- DCHECK(url_request_context);
- DCHECK(host_resolver);
-
- if (!use_v8_) {
- return URLRequestContextBuilder::CreateProxyService(
- std::move(proxy_config_service), url_request_context, host_resolver,
- network_delegate, net_log);
- }
-
- std::unique_ptr<net::DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher =
- dhcp_fetcher_factory_->Create(url_request_context);
- std::unique_ptr<net::ProxyScriptFetcher> proxy_script_fetcher =
- base::MakeUnique<ProxyScriptFetcherImpl>(url_request_context);
- std::unique_ptr<ProxyService> proxy_service;
-#ifdef ENABLE_NET_MOJO
- if (mojo_proxy_resolver_factory_) {
- proxy_service = CreateProxyServiceUsingMojoFactory(
- mojo_proxy_resolver_factory_, std::move(proxy_config_service),
- proxy_script_fetcher.release(), std::move(dhcp_proxy_script_fetcher),
- host_resolver, net_log, network_delegate);
- }
-#endif // ENABLE_NET_MOJO
- if (!proxy_service) {
- proxy_service = CreateProxyServiceUsingV8ProxyResolver(
- std::move(proxy_config_service), proxy_script_fetcher.release(),
- std::move(dhcp_proxy_script_fetcher), host_resolver, net_log,
- network_delegate);
- }
-
- proxy_service->set_quick_check_enabled(quick_check_enabled_);
- proxy_service->set_sanitize_url_policy(sanitize_url_policy_);
-
- return proxy_service;
-}
-
-} // namespace net
« no previous file with comments | « net/url_request/url_request_context_builder_v8.h ('k') | net/url_request/url_request_context_builder_v8_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698