Add the plumbing to set an authentication key for DRP

BUG=b/12492817

DRP needs an authentication key to proceed. Add the plumbing.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268787 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 3 deletions

diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 1ca196c..e4a2a1d 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -75,8 +75,6 @@ AwBrowserContext* AwBrowserContext::FromWebContents(
 
 void AwBrowserContext::PreMainMessageLoopRun() {
   cookie_store_ = CreateCookieStore(this);
-  // TODO(sgurun): A valid key will need to be supplied here.
-  DataReductionProxySettings::SetKey("test_key");
   DataReductionProxySettings::SetAllowed(true);
   DataReductionProxySettings::SetPromoAllowed(false);
   data_reduction_proxy_settings_.reset(
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
index 5f710a8..a7fd4f8 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
@@ -45,9 +45,16 @@ public class AwContentsStatics {
         callback.run();
     }
 
+    /**
+     * Set Data Reduction Proxy key for authentication.
+     */
+    public static void setDataReductionProxyKey(String key) {
+        nativeSetDataReductionProxyKey(key);
+    }
+
     //--------------------------------------------------------------------------------------------
     //  Native methods
     //--------------------------------------------------------------------------------------------
     private static native void nativeClearClientCertPreferences(Runnable callback);
-
+    private static native void nativeSetDataReductionProxyKey(String key);
 }
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
index 2b38d79..29453e6 100644
--- a/android_webview/native/aw_contents_statics.cc
+++ b/android_webview/native/aw_contents_statics.cc
@@ -4,15 +4,19 @@
 
 #include "android_webview/native/aw_contents_statics.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_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/AwContentsStatics_jni.h"
 #include "net/cert/cert_database.h"
 
 using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
+using data_reduction_proxy::DataReductionProxySettings;
 
 namespace android_webview {
 
@@ -43,6 +47,11 @@ void ClearClientCertPreferences(JNIEnv* env, jclass, jobject callback) {
       base::Bind(&ClientCertificatesCleared, base::Owned(j_callback)));
 }
 
+// static
+void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) {
+    DataReductionProxySettings::SetKey(ConvertJavaStringToUTF8(env, key));
+}
+
 bool RegisterAwContentsStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }