Clean up download code:

chrome/browser/views/tab_contents/tab_contents_drag_win.cc

 // Copyright (c) 2010 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/views/tab_contents/tab_contents_drag_win.h"
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/drag_download_file.h"
 #include "chrome/browser/download/drag_download_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.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/views/tab_contents/tab_contents_view_win.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
@@ skipping 163 matching lines @@
   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;
-  DownloadManager::GenerateFileName(download_url,
-                                    content_disposition,
-                                    std::string(),
-                                    UTF16ToUTF8(mime_type),
-                                    &generated_file_name);
+  download_util::GenerateFileName(download_url,
+                                  content_disposition,
+                                  std::string(),
+                                  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,
@@ skipping 139 matching lines @@
 
 void TabContentsDragWin::OnDataObjectDisposed() {
   DCHECK(drag_drop_thread_id_ == PlatformThread::CurrentId());
 
   // The drag-and-drop thread is only closed after OLE is done with
   // DataObjectImpl.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &TabContentsDragWin::CloseThread));
 }