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

chrome/browser/ui/views/tab_contents/tab_contents_drag_win.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 "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h"
 
 #include <windows.h>
 
 #include <string>
 
@@ skipping 178 matching lines @@
   string16 mime_type;
   FilePath file_name;
   GURL download_url;
   if (!drag_download_util::ParseDownloadMetadata(drop_data.download_metadata,
                                                  &mime_type,
                                                  &file_name,
                                                  &download_url))
     return;
 
   // Generate the download filename.
-  std::string content_disposition =
-      "attachment; filename=" + UTF16ToUTF8(file_name.value());
   FilePath generated_file_name;
-  download_util::GenerateFileName(download_url,
-                                  content_disposition,
-                                  std::string(),
-                                  UTF16ToUTF8(mime_type),
-                                  &generated_file_name);
+  download_util::GenerateFileNameFromSuggestedName(
+      download_url,
+      UTF16ToUTF8(file_name.value()),
+      UTF16ToUTF8(mime_type),
+      &generated_file_name);
 
   // Provide the data as file (CF_HDROP). A temporary download file with the
   // Zone.Identifier ADS (Alternate Data Stream) attached will be created.
   linked_ptr<net::FileStream> empty_file_stream;
   scoped_refptr<DragDownloadFile> download_file =
       new DragDownloadFile(generated_file_name,
                            empty_file_stream,
                            download_url,
                            page_url,
                            page_encoding,
                            view_->GetTabContents());
   ui::OSExchangeData::DownloadFileInfo file_download(FilePath(),
                                                      download_file.get());
   data->SetDownloadFileInfo(file_download);
 
   // Enable asynchronous operation.
   ui::OSExchangeDataProviderWin::GetIAsyncOperation(*data)->SetAsyncMode(TRUE);
 }
 
 void TabContentsDragWin::PrepareDragForFileContents(
     const WebDropData& drop_data, ui::OSExchangeData* data) {
   // Images without ALT text will only have a file extension so we need to
   // synthesize one from the provided extension and URL.
   FilePath file_name(drop_data.file_description_filename);
   file_name = file_name.BaseName().RemoveExtension();
   if (file_name.value().empty()) {
     // Retrieve the name from the URL.
     file_name = FilePath(
-        net::GetSuggestedFilename(drop_data.url, "", "", string16()));
+        net::GetSuggestedFilename(drop_data.url, "", "", "", string16()));
     if (file_name.value().size() + drop_data.file_extension.size() + 1 >
         MAX_PATH) {
       file_name = FilePath(file_name.value().substr(
           0, MAX_PATH - drop_data.file_extension.size() - 2));
     }
   }
   file_name = file_name.ReplaceExtension(drop_data.file_extension);
   data->SetFileContents(file_name, drop_data.file_contents);
 }
 
@@ skipping 113 matching lines @@
 
 void TabContentsDragWin::OnDataObjectDisposed() {
   DCHECK(drag_drop_thread_id_ == base::PlatformThread::CurrentId());
 
   // The drag-and-drop thread is only closed after OLE is done with
   // DataObjectImpl.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &TabContentsDragWin::CloseThread));
 }