Clean up download code:

chrome/browser/download/download_util.h

 // Copyright (c) 2009 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 utilities.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "gfx/native_widget_types.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "views/view.h"
 #endif
 
 namespace gfx {
 class Canvas;
 }
 
 class BaseDownloadItemModel;
 class DictionaryValue;
 class DownloadItem;
-class FilePath;
+class DownloadManager;
 class GURL;
+class Profile;
 class ResourceDispatcherHost;
 class SkBitmap;
 class URLRequestContextGetter;
 
+struct DownloadCreateInfo;
 struct DownloadSaveInfo;
 
 namespace download_util {
 
 // Download temporary file creation --------------------------------------------
 
 // Return the default download directory.
 const FilePath& GetDefaultDownloadDirectory();
 
 // Create a temporary file for a download in the user's default download
 // directory and return true if was successful in creating the file.
 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.
+void GenerateFileNameFromInfo(DownloadCreateInfo* info,
+                              FilePath* generated_name);
+
+// Create a file name based on the response from the server.
+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);
+
+// Opens downloaded Chrome extension file (*.crx).
+void OpenChromeExtension(Profile* profile,
+                         DownloadManager* download_manager,
+                         const DownloadItem& download_item);
+
 // Download progress animations ------------------------------------------------
 
 // Arc sweep angle for use with downloads of unknown size
 const int kUnknownAngleDegrees = 50;
 
 // Rate of progress for use with downloads of unknown size
 const int kUnknownIncrementDegrees = 12;
 
 // Start angle for downloads with known size (midnight position)
 const int kStartAngleDegrees = -90;
@@ skipping 58 matching lines @@
 // Helper function for download views to use when acting as a drag source for a
 // DownloadItem. If |icon| is NULL, no image will be accompany the drag. |view|
 // is only required for Mac OS X, elsewhere it can be NULL.
 void DragDownload(const DownloadItem* download,
                   SkBitmap* icon,
                   gfx::NativeView view);
 
 // Executable file support -----------------------------------------------------
 
 // Determine if the specified extension is an executable extension.
-bool IsExecutableExtension(const std::string& extension);
+bool IsExecutableExtension(const FilePath::StringType& extension);
+
+// Tests if we think the server means for this mime_type to be executable.
+bool IsExecutableMimeType(const std::string& mime_type);
 
 // Helpers ---------------------------------------------------------------------
 
 // Creates a representation of a download in a format that the downloads
 // HTML page can understand.
 DictionaryValue* CreateDownloadItemValue(DownloadItem* download, int id);
 
 // Get the localized status text for an in-progress download.
 std::wstring GetProgressStatusText(DownloadItem* download);
 
@@ skipping 36 matching lines @@
 // If |path| does not exist, 0 is returned.  If it fails to find such
 // a number, -1 is returned.
 int GetUniquePathNumberWithCrDownload(const FilePath& path);
 
 // Returns a .crdownload intermediate path for the |suggested_path|.
 FilePath GetCrDownloadPath(const FilePath& suggested_path);
 
 }  // namespace download_util
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H_