Fix bug 79905: Drag and drop of "DownloadURL" type ignores specified filename for data URLs.

net/base/net_util.cc

 // Copyright (c) 2011 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 "net/base/net_util.h"
 
 #include <unicode/regex.h>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
 #include <unicode/ulocdata.h>
@@ skipping 1230 matching lines @@
 }
 
 string16 StripWWW(const string16& text) {
   const string16 www(ASCIIToUTF16("www."));
   return StartsWith(text, www, true) ? text.substr(www.length()) : text;
 }
 
 string16 GetSuggestedFilename(const GURL& url,
                               const std::string& content_disposition,
                               const std::string& referrer_charset,
+                              const std::string& suggested_name,
                               const string16& default_name) {
   // TODO: this function to be updated to match the httpbis recommendations.
   // Talk to abarth for the latest news.
 
   // We don't translate this fallback string, "download". If localization is
   // needed, the caller should provide localized fallback default_name.
   static const char* kFinalFallbackName = "download";
 
-  // about: and data: URLs don't have file names, but esp. data: URLs may
-  // contain parts that look like ones (i.e., contain a slash).
-  // Therefore we don't attempt to divine a file name out of them.
-  if (url.SchemeIs("about") || url.SchemeIs("data")) {
-    return default_name.empty() ? ASCIIToUTF16(kFinalFallbackName)
-                                : default_name;
-  }
+  std::string filename;
 
-  std::string filename = GetFileNameFromCD(content_disposition,
-                                           referrer_charset);
+  // Try to extract from content-disposition first.
+  if (!content_disposition.empty())
+    filename = GetFileNameFromCD(content_disposition, referrer_charset);
+
+  // Then try to use suggested name.
+  if (filename.empty() && !suggested_name.empty())
+    filename = suggested_name;
 
   if (!filename.empty()) {
     // Replace any path information the server may have sent, by changing
     // path separators with underscores.
     ReplaceSubstringsAfterOffset(&filename, 0, "/", "_");
     ReplaceSubstringsAfterOffset(&filename, 0, "\\", "_");
 
     // Next, remove "." from the beginning and end of the file name to avoid
     // tricks with hidden files, "..", and "."
     TrimString(filename, ".", &filename);
   }
+
   if (filename.empty()) {
+    // about: and data: URLs don't have file names, but esp. data: URLs may
+    // contain parts that look like ones (i.e., contain a slash).
+    // Therefore we don't attempt to divine a file name out of them.
+    if (url.SchemeIs("about") || url.SchemeIs("data")) {
+      return default_name.empty() ? ASCIIToUTF16(kFinalFallbackName)
+                                  : default_name;
+    }
+
     if (url.is_valid()) {
       const std::string unescaped_url_filename = UnescapeURLComponent(
           url.ExtractFileName(),
           UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
 
       // The URL's path should be escaped UTF-8, but may not be.
       std::string decoded_filename = unescaped_url_filename;
       if (!IsStringASCII(decoded_filename)) {
         bool ignore;
         // TODO(jshin): this is probably not robust enough. To be sure, we
@@ skipping 938 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net