Make all drag sources not depend on download_util.

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>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/tab_contents/web_drag_source_win.h"
 #include "chrome/browser/tab_contents/web_drag_utils_win.h"
 #include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/net_util.h"
 #include "views/drag_utils.h"
 #include "webkit/glue/webdropdata.h"
 
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
 
 namespace {
@@ skipping 151 matching lines @@
   // Parse the download metadata.
   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.
-  FilePath generated_file_name;
-  download_util::GenerateFileNameFromSuggestedName(
-      download_url,
-      UTF16ToUTF8(file_name.value()),
-      UTF16ToUTF8(mime_type),
-      &generated_file_name);
+  // Generate the file name based on both mime type and proposed file name.
+  std::string default_name =
+      content::GetContentClient()->browser()->GetDefaultDownloadName();
+  FilePath generated_download_file_name =
+      net::GenerateFileName(download_url,
+                            std::string(),
+                            std::string(),
+                            UTF16ToUTF8(file_name.value()),
+                            UTF16ToUTF8(mime_type),
+                            default_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,
+      new DragDownloadFile(generated_download_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.
@@ skipping 139 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,
       base::Bind(&TabContentsDragWin::CloseThread, this));
 }