Fix an issue that download filename from content disposition is not sanitized

content/browser/android/download_controller_android_impl.cc

Index: content/browser/android/download_controller_android_impl.cc
diff --git a/content/browser/android/download_controller_android_impl.cc b/content/browser/android/download_controller_android_impl.cc
index 76d7f85d3882b020b7f4aa0eeecd352cacdff78a..187cf3a288d5b184851ab3ae302acbedeaed8a13 100644
--- a/content/browser/android/download_controller_android_impl.cc
+++ b/content/browser/android/download_controller_android_impl.cc
@@ -32,6 +32,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/referrer.h"
 #include "jni/DownloadController_jni.h"
+#include "net/base/filename_util.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_content_disposition.h"
@@ -392,7 +393,14 @@ void DownloadControllerAndroidImpl::StartAndroidDownloadInternal(
   // explicitly specified filename if available.
   net::HttpContentDisposition header(info.content_disposition, "");

[asanka, 2016/02/22 22:56:08]

header is unused.

[qinmin, 2016/02/22 23:03:36]

Done.

   ScopedJavaLocalRef<jstring> jfilename =
-      ConvertUTF8ToJavaString(env, header.filename());
+      base::android::ConvertUTF16ToJavaString(
+          env,
+          net::GetSuggestedFilename(info.url,
+                                    info.content_disposition,
+                                    std::string(),  // referrer_charset
+                                    std::string(),  // suggested_name
+                                    info.original_mime_type,
+                                    std::string()));  // default name

[asanka, 2016/02/22 22:56:08]

Provide a default name in case one cannot be generated based on the URL and
Content-Disposition.

[qinmin, 2016/02/22 23:03:36]

net::GetSuggestedFilename() will fallback to "download" as filename, so i think
this is not needed.

[asanka, 2016/02/23 00:05:56]

That's not a localized string. See IDS_DEFAULT_DOWNLOAD_FILENAME for the correct
fallback filename.

[qinmin, 2016/02/23 07:23:10]

Done. IDS_DEFAULT_DOWNLOAD_FILENAME is defined in chrome/, use
DownloadManagerService to pass the localized string to this class

 
   Java_DownloadController_newHttpGetDownload(
       env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(),