Move data reduction proxy to Chrome-Proxy header for authentication

android_webview/browser/aw_login_delegate.cc

 // Copyright (c) 2012 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 "android_webview/browser/aw_login_delegate.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/supports_user_data.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
 #include "net/url_request/url_request.h"
 
 using namespace base::android;
 
 using content::BrowserThread;
 using content::RenderFrameHost;
 using content::ResourceDispatcherHost;
 using content::ResourceRequestInfo;
 using content::WebContents;
-using data_reduction_proxy::DataReductionProxyAuthRequestHandler;
-using data_reduction_proxy::DataReductionProxySettings;
 
 namespace {
 const char* kAuthAttemptsKey = "android_webview_auth_attempts";
 
 class UrlRequestAuthAttemptsData : public base::SupportsUserData::Data {
  public:
   UrlRequestAuthAttemptsData() : auth_attempts_(0) { }
   int auth_attempts_;
 };
 
@@ skipping 49 matching lines @@
     bool first_auth_attempt) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create(
       this, auth_info_.get(), first_auth_attempt));
 
   RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
       render_process_id_, render_frame_id_);
   WebContents* web_contents = WebContents::FromRenderFrameHost(
       render_frame_host);
-  AwBrowserContext* browser_context =
-      AwBrowserContext::FromWebContents(web_contents);
-  DataReductionProxySettings* drp_settings =
-      browser_context->GetDataReductionProxySettings();
-  if (drp_settings && drp_settings->IsDataReductionProxyEnabled()) {
-    // The data reduction proxy auth handler should only be reset on the first
-    // auth attempt, because it maintains internal state to cancel if there have
-    // been too many attempts.
-    if (!drp_auth_handler_.get()) {
-      drp_auth_handler_.reset(new DataReductionProxyAuthRequestHandler(
-          drp_settings));
-    }
-    DCHECK(drp_auth_handler_.get());
-    base::string16 user, password;
-    DataReductionProxyAuthRequestHandler::TryHandleResult drp_result =
-        drp_auth_handler_->TryHandleAuthentication(
-            auth_info_.get(), &user, &password);
-    if (drp_result ==
-            DataReductionProxyAuthRequestHandler::TRY_HANDLE_RESULT_PROCEED) {
-      Proceed(user, password);
-      return;
-    }
-    if (drp_result ==
-            DataReductionProxyAuthRequestHandler::TRY_HANDLE_RESULT_CANCEL) {
-      Cancel();
-      return;
-    }
-    // Fall through if |drp_result| is IGNORE
-  }
-
   if (!aw_http_auth_handler_->HandleOnUIThread(web_contents)) {
     Cancel();
     return;
   }
 }
 
 void AwLoginDelegate::CancelOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request_) {
     request_->CancelAuth();
@@ skipping 23 matching lines @@
 void AwLoginDelegate::DeleteAuthHandlerSoon() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&AwLoginDelegate::DeleteAuthHandlerSoon, this));
     return;
   }
   aw_http_auth_handler_.reset();
 }
 
 }  // namespace android_webview