Revert "Adding q=low to the Chrome-Proxy request header"

Speculatively revert https://codereview.chromium.org/791493015
due to multiple browser_tests failures (e.g. see
https://build.chromium.org/p/chromium.webkit/builders/Win7%20%28dbg%29/builds/15751)
They are all due to SystemURLRequestContextGetter-related leaks.

This reverts commit 8fbff4fad29b9e2408c634e178386d456acf6467.

TBR=megjablon
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=456110

Review URL: https://codereview.chromium.org/903073003

Cr-Commit-Position: refs/heads/master@{#315031}

3 files changed, 15 insertions, 14 deletions

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 3366ccc..e0f9013 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -18,11 +18,11 @@
 #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_auth_request_handler.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.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/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ -271,9 +271,9 @@ void AwURLRequestContextGetter::SetHandlersAndInterceptors(
   request_interceptors_.swap(request_interceptors);
 }
 
-data_reduction_proxy::DataReductionProxyRequestOptions*
-AwURLRequestContextGetter::GetDataReductionProxyRequestOptions() const {
-  return data_reduction_proxy_request_options_.get();
+data_reduction_proxy::DataReductionProxyAuthRequestHandler*
+AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const {
+  return data_reduction_proxy_auth_request_handler_.get();
 }
 
 net::NetLog* AwURLRequestContextGetter::GetNetLog() {
@@ -281,8 +281,8 @@ net::NetLog* AwURLRequestContextGetter::GetNetLog() {
 }
 
 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
-  DCHECK(data_reduction_proxy_request_options_);
-  data_reduction_proxy_request_options_->InitAuthentication(key);
+  DCHECK(data_reduction_proxy_auth_request_handler_);
+  data_reduction_proxy_auth_request_handler_->InitAuthentication(key);
 }
 
 }  // namespace android_webview
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 97610e6..fbaf24a 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -24,7 +24,7 @@ class URLRequestJobFactory;
 }
 
 namespace data_reduction_proxy {
-class DataReductionProxyRequestOptions;
+class DataReductionProxyAuthRequestHandler;
 }
 
 namespace android_webview {
@@ -43,8 +43,8 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override;
 
-  data_reduction_proxy::DataReductionProxyRequestOptions*
-      GetDataReductionProxyRequestOptions() const;
+  data_reduction_proxy::DataReductionProxyAuthRequestHandler*
+      GetDataReductionProxyAuthRequestHandler() const;
 
   // NetLog is thread-safe, so clients can call this method from arbitrary
   // threads (UI and IO).
@@ -75,8 +75,8 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_ptr<net::NetLog> net_log_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
-  scoped_ptr<data_reduction_proxy::DataReductionProxyRequestOptions>
-      data_reduction_proxy_request_options_;
+  scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
+      data_reduction_proxy_auth_request_handler_;
   scoped_ptr<net::URLRequestJobFactory> job_factory_;
   scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
 
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
index 77747e1..e09fcb8c 100644
--- a/android_webview/native/aw_contents_statics.cc
+++ b/android_webview/native/aw_contents_statics.cc
@@ -10,7 +10,7 @@
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_constants.h"
@@ -21,6 +21,7 @@ using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
+using data_reduction_proxy::DataReductionProxyAuthRequestHandler;
 
 namespace android_webview {
 
@@ -59,13 +60,13 @@ void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) {
   // The following call to GetRequestContext() could possibly be the first such
   // call, which means AwURLRequestContextGetter::InitializeURLRequestContext
   // will be called on IO thread as a result. InitializeURLRequestContext()
-  // will initialize DataReductionProxyRequestOptions.
+  // will initialize DataReductionProxyAuthRequestHandler.
   AwURLRequestContextGetter* aw_url_request_context_getter =
       static_cast<AwURLRequestContextGetter*>(
           browser_context->GetRequestContext());
 
   // This PostTask has to be called after GetRequestContext, because SetKeyOnIO
-  // needs a valid DataReductionProxyRequestOptions object.
+  // needs a valid DataReductionProxyAuthRequestHandler object.
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&AwURLRequestContextGetter::SetKeyOnIO,