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

Unified Diff: android_webview/browser/net/aw_url_request_context_getter.cc

Issue 2101153003: Remove data reduction proxy code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index a3dc454a5efe35d884afd6c4f82cf099e49b9817..ba3e94b8e7bd50bbe800b0355e159a84b55e62b9 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -24,9 +24,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/worker_pool.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
#include "components/network_session_configurator/switches.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
@@ -205,16 +202,11 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
DCHECK(!url_request_context_);
net::URLRequestContextBuilder builder;
- std::unique_ptr<AwNetworkDelegate> aw_network_delegate(
- new AwNetworkDelegate());
AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
DCHECK(browser_context);
- builder.set_network_delegate(
- browser_context->GetDataReductionProxyIOData()->CreateNetworkDelegate(
- std::move(aw_network_delegate),
- false /* No UMA is produced to track bypasses. */));
+ builder.set_network_delegate(base::WrapUnique(new AwNetworkDelegate()));
#if !defined(DISABLE_FTP_SUPPORT)
builder.set_ftp_enabled(false); // Android WebView does not support ftp yet.
#endif
@@ -271,9 +263,6 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
job_factory_ =
CreateJobFactory(&protocol_handlers_, std::move(request_interceptors_));
- job_factory_.reset(new net::URLRequestInterceptingJobFactory(
- std::move(job_factory_),
- browser_context->GetDataReductionProxyIOData()->CreateInterceptor()));
url_request_context_->set_job_factory(job_factory_.get());
url_request_context_->set_http_user_agent_settings(
http_user_agent_settings_.get());
@@ -303,12 +292,6 @@ net::NetLog* AwURLRequestContextGetter::GetNetLog() {
return net_log_.get();
}
-void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
- DCHECK(AwBrowserContext::GetDefault()->GetDataReductionProxyIOData());
- AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()->
- request_options()->SetKeyOnIO(key);
-}
-
std::unique_ptr<net::HttpAuthHandlerFactory>
AwURLRequestContextGetter::CreateAuthHandlerFactory(
net::HostResolver* resolver) {

Powered by Google App Engine
This is Rietveld 408576698