Moved data reduction proxy initialization logic to ProfileImplIOData

android_webview/native/aw_contents_statics.cc

 // Copyright 2014 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/native/aw_contents_statics.h"
 
 #include "android_webview/browser/aw_browser_context.h"
+#include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "components/data_reduction_proxy/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"
 #include "jni/AwContentsStatics_jni.h"
 #include "net/cert/cert_database.h"
 
@@ skipping 29 matching lines @@
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&NotifyClientCertificatesChanged),
       base::Bind(&ClientCertificatesCleared, base::Owned(j_callback)));
 }
 
 // static
 void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) {
   AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
   DCHECK(browser_context);
-  DataReductionProxyAuthRequestHandler* drp_auth_request_handler =
-      browser_context->GetDataReductionProxyAuthRequestHandler();
-  if (drp_auth_request_handler)
-    drp_auth_request_handler->SetKey(
+  DCHECK(browser_context->GetRequestContext());
+  AwURLRequestContextGetter* aw_url_request_context_getter =
+      static_cast<AwURLRequestContextGetter*>(
+          browser_context->GetRequestContext());
+  DataReductionProxyAuthRequestHandler* auth_request_handler =
+      aw_url_request_context_getter->GetDataReductionProxyAuthRequestHandler();
+  if (auth_request_handler) {
+    auth_request_handler->SetKeyOnUI(
         ConvertJavaStringToUTF8(env, key),
         data_reduction_proxy::kClientAndroidWebview,
         data_reduction_proxy::kProtocolVersion);
+  } else {
+    DLOG(ERROR) << "Data reduction proxy auth request handler does not exist";
+  }
 }
 
 // static
 void SetDataReductionProxyEnabled(JNIEnv* env, jclass, jboolean enabled) {
   AwBrowserContext::SetDataReductionProxyEnabled(enabled);
 }
 
 // static
 jstring GetUnreachableWebDataUrl(JNIEnv* env, jclass) {
   return base::android::ConvertUTF8ToJavaString(
              env, content::kUnreachableWebDataURL).Release();
 }
 
 // static
 void SetRecordFullDocument(JNIEnv* env, jclass, jboolean record_full_document) {
   content::SynchronousCompositor::SetRecordFullDocument(record_full_document);
 }
 
 bool RegisterAwContentsStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview