Make all drag sources not depend on download_util.

chrome/browser/download/download_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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 70 matching lines @@
 // TODO(phajdan.jr): Find some standard location for this, maintaining
 // the same value on all platforms.
 static const double PI = 3.141592653589793;
 
 namespace download_util {
 
 // How many times to cycle the complete animation. This should be an odd number
 // so that the animation ends faded out.
 static const int kCompleteAnimationCycles = 5;
 
-namespace {
-
-void GenerateFileNameInternal(const GURL& url,
-                              const std::string& content_disposition,
-                              const std::string& referrer_charset,
-                              const std::string& suggested_name,
-                              const std::string& mime_type,
-                              FilePath* generated_name) {
-  std::string default_file_name(
-      l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
-
-  *generated_name = net::GenerateFileName(url, content_disposition,
-                                          referrer_charset, suggested_name,
-                                          mime_type, default_file_name);
-}
-
-}  // namespace
-
 // Download temporary file creation --------------------------------------------
 
 class DefaultDownloadDirectory {
  public:
   const FilePath& path() const { return path_; }
  private:
   DefaultDownloadDirectory() {
     if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path_)) {
       NOTREACHED();
     }
@@ skipping 18 matching lines @@
   FilePath desktop_dir;
   if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_dir)) {
     NOTREACHED();
     return false;
   }
   return (download_path == desktop_dir);
 }
 
 void GenerateFileNameFromRequest(const DownloadItem& download_item,
                                  FilePath* generated_name) {
-  GenerateFileNameInternal(download_item.GetURL(),
-                           download_item.content_disposition(),
-                           download_item.referrer_charset(),
-                           download_item.suggested_filename(),
-                           download_item.mime_type(),
-                           generated_name);
-}
+  std::string default_file_name(
+      l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
 
-void GenerateFileNameFromSuggestedName(const GURL& url,
-                                       const std::string& suggested_name,
-                                       const std::string& mime_type,
-                                       FilePath* generated_name) {
-  // TODO(asanka): We should pass in a valid referrer_charset here.
-  GenerateFileNameInternal(url, std::string(), std::string(),
-                           suggested_name, mime_type, generated_name);
+  *generated_name = net::GenerateFileName(download_item.GetURL(),
+                                          download_item.content_disposition(),
+                                          download_item.referrer_charset(),
+                                          download_item.suggested_filename(),
+                                          download_item.mime_type(),
+                                          default_file_name);
 }
 
 // Download progress painting --------------------------------------------------
 
 // Common bitmaps used for download progress animations. We load them once the
 // first time we do a progress paint, then reuse them as they are always the
 // same.
 SkBitmap* g_foreground_16 = NULL;
 SkBitmap* g_background_16 = NULL;
 SkBitmap* g_foreground_32 = NULL;
@@ skipping 417 matching lines @@
   return DownloadFile::GetUniquePathNumberWithSuffix(
       path, FILE_PATH_LITERAL(".crdownload"));
 }
 
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
   return DownloadFile::AppendSuffixToPath(
       suggested_path, FILE_PATH_LITERAL(".crdownload"));
 }
 
 }  // namespace download_util