Move filename determination to net_util

chrome/browser/download/download_util.h

Index: chrome/browser/download/download_util.h
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index d36762d4b06fb2d83377e6f39823f3ef9a0b1ed9..50b930b49160762a9e10bbf6250499c1493abba2 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -60,31 +60,20 @@ bool CreateTemporaryFileForDownload(FilePath* path);
 // Return true if the |download_path| is dangerous path.
 bool DownloadPathIsDangerous(const FilePath& download_path);
 
-// Create an extension based on the file name and mime type.
-void GenerateExtension(const FilePath& file_name,
-                       const std::string& mime_type,
-                       FilePath::StringType* generated_extension);
-
-// Create a file name based on the response from the server.
+// Generate a filename based on the response from the server.  Similar
+// in operation to net::GenerateFileName(), but uses a localized
+// default name.
 void GenerateFileNameFromRequest(const DownloadItem& download_item,
                                  FilePath* generated_name);
 
+// Generate a filename based on the URL, a suggested name and a MIME
+// type.  Similar in operation to net::GenerateFileName(), but uses a
+// localized default name.
 void GenerateFileNameFromSuggestedName(const GURL& url,
                                        const std::string& suggested_name,
                                        const std::string& mime_type,
                                        FilePath* generated_name);
 
-void GenerateFileName(const GURL& url,
-                      const std::string& content_disposition,
-                      const std::string& referrer_charset,
-                      const std::string& mime_type,
-                      FilePath* generated_name);
-
-// Used to make sure we have a safe file extension and filename for a
-// download.  |file_name| can either be just the file name or it can be a
-// full path to a file.
-void GenerateSafeFileName(const std::string& mime_type, FilePath* file_name);
-
 // Download progress animations ------------------------------------------------
 
 // Arc sweep angle for use with downloads of unknown size
@@ -270,10 +259,6 @@ void NotifyDownloadInitiated(int render_process_id, int render_view_id);
 // a number, -1 is returned.
 int GetUniquePathNumberWithCrDownload(const FilePath& path);
 
-// Erases all downloaded files with the specified path and name prefix.
-// Used by download UI tests to clean up the download directory.
-void EraseUniqueDownloadFiles(const FilePath& path_prefix);
-
 // Returns a .crdownload intermediate path for the |suggested_path|.
 FilePath GetCrDownloadPath(const FilePath& suggested_path);