Pass file name when downloading OMA DRM files

chrome/browser/android/download/chrome_download_delegate.cc

 // Copyright 2015 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 "chrome/browser/android/download/chrome_download_delegate.h"
 
 #include <jni.h>
 
 #include <string>
 #include <type_traits>
@@ skipping 113 matching lines @@
 
 void ChromeDownloadDelegate::RequestFileAccess(intptr_t callback_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ChromeDownloadDelegate_requestFileAccess(
       env, java_ref_, callback_id);
 }
 
 void ChromeDownloadDelegate::EnqueueDownloadManagerRequest(
     const std::string& url,
     const std::string& user_agent,
-    const std::string& content_disposition,
+    const base::string16& file_name,
     const std::string& mime_type,
     const std::string& cookie,
     const std::string& referer) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, url);
   ScopedJavaLocalRef<jstring> juser_agent =
       ConvertUTF8ToJavaString(env, user_agent);
-  ScopedJavaLocalRef<jstring> jcontent_disposition =
-      ConvertUTF8ToJavaString(env, content_disposition);
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, mime_type);
   ScopedJavaLocalRef<jstring> jcookie =
       ConvertUTF8ToJavaString(env, cookie);
   ScopedJavaLocalRef<jstring> jreferer =
       ConvertUTF8ToJavaString(env, referer);
+  ScopedJavaLocalRef<jstring> jfile_name =
+      base::android::ConvertUTF16ToJavaString(env, file_name);
   Java_ChromeDownloadDelegate_enqueueAndroidDownloadManagerRequest(
-      env, java_ref_, jurl, juser_agent, jcontent_disposition, jmime_type,
-      jcookie, jreferer);
+      env, java_ref_, jurl, juser_agent, jfile_name, jmime_type, jcookie,
+      jreferer);
 }
 
 void Init(JNIEnv* env,
           const JavaParamRef<jobject>& obj,
           const JavaParamRef<jobject>& jweb_contents) {
   auto* web_contents = WebContents::FromJavaWebContents(jweb_contents);
   ChromeDownloadDelegate::CreateForWebContents(web_contents);
   ChromeDownloadDelegate::FromWebContents(web_contents)->SetJavaRef(env, obj);
 }
 
 bool RegisterChromeDownloadDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeDownloadDelegate);