DCHECK that jstring to C++ string conversions don't pass in null.

chrome/browser/ui/android/context_menu_helper.cc

Index: chrome/browser/ui/android/context_menu_helper.cc
diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc
index 0dc0ade3b5cf30143008545801e34a3b02d2c3cf..b6b324bc48d9cae3c8e66fe53cbfd27d2fb35385 100644
--- a/chrome/browser/ui/android/context_menu_helper.cc
+++ b/chrome/browser/ui/android/context_menu_helper.cc
@@ -27,12 +27,11 @@ using base::android::ConvertUTF16ToJavaString;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ContextMenuHelper);
 
-namespace {
-
 const int kShareImageMaxWidth = 2048;
 const int kShareImageMaxHeight = 2048;
 
-}  // namespace
+const char kDataReductionProxyPassthroughHeader[] =

[Miguel Garcia, 2016/03/30 14:30:12]

can you at least add a comment saying that the java version is in
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
and should be kept in sync?

[Bernhard Bauer, 2016/03/30 14:43:44]

It's gone from there. That value was only used to pass it to C++, so I moved the
whole thing here.

+    "Chrome-Proxy: pass-through\r\n";
 
 ContextMenuHelper::ContextMenuHelper(content::WebContents* web_contents)
     : web_contents_(web_contents) {
@@ -108,11 +107,15 @@ ContextMenuHelper::CreateJavaContextMenuParams(
   return jmenu_info;
 }
 
-void ContextMenuHelper::OnStartDownload(JNIEnv* env,
-                                        const JavaParamRef<jobject>& obj,
-                                        jboolean jis_link,
-                                        const JavaParamRef<jstring>& jheaders) {
-  std::string headers(ConvertJavaStringToUTF8(env, jheaders));
+void ContextMenuHelper::OnStartDownload(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jboolean jis_link,
+    jboolean jis_data_reduction_proxy_enabled) {
+  std::string headers;
+  if (jis_data_reduction_proxy_enabled)
+    headers = kDataReductionProxyPassthroughHeader;
+
   content::DownloadControllerAndroid::Get()->StartContextMenuDownload(
       context_menu_params_,
       web_contents_,