Reduced the lifetime of DownloadCreateInfo.

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 231 matching lines @@
     // The GetPreferredExtensionForMimeType call will end up going to disk.  Do
     // this on another thread to avoid slowing the IO thread.
     // http://crbug.com/61827
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     net::GetPreferredExtensionForMimeType(mime_type, &extension);
   }
 
   generated_extension->swap(extension);
 }
 
-void GenerateFileNameFromInfo(DownloadCreateInfo* info,
-                              FilePath* generated_name) {
-  GenerateFileName(GURL(info->url()),
-                   info->content_disposition,
-                   info->referrer_charset,
-                   info->mime_type,
+void GenerateFileNameFromRequest(const GURL& url,
+                                 const std::string& content_disposition,
+                                 const std::string& referrer_charset,
+                                 const std::string& mime_type,
+                                 FilePath* generated_name) {
+  GenerateFileName(url,
+                   content_disposition,
+                   referrer_charset,
+                   mime_type,
                    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) {
   string16 default_file_name(
       l10n_util::GetStringUTF16(IDS_DEFAULT_DOWNLOAD_FILENAME));
@@ skipping 615 matching lines @@
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
   FilePath::StringType file_name;
   base::SStringPrintf(
       &file_name,
       PRFilePathLiteral FILE_PATH_LITERAL(".crdownload"),
       suggested_path.value().c_str());
   return FilePath(file_name);
 }
 
 // TODO(erikkay,phajdan.jr): This is apparently not being exercised in tests.
-bool IsDangerous(DownloadCreateInfo* info, Profile* profile, bool auto_open) {
+bool IsDangerous(const GURL& url,
+                 const GURL& referrer_url,
+                 const FilePath& suggested_path,
+                 bool has_user_gesture,
+                 bool is_extension_install,
+                 Profile* profile,
+                 bool auto_open) {
   DownloadDangerLevel danger_level = GetFileDangerLevel(
-      info->suggested_path.BaseName());
+      suggested_path.BaseName());
   if (danger_level == Dangerous)
-    return !(auto_open && info->has_user_gesture);
-  if (danger_level == AllowOnUserGesture && !info->has_user_gesture)
+    return !(auto_open && has_user_gesture);
+  if (danger_level == AllowOnUserGesture && !has_user_gesture)
     return true;
-  if (info->is_extension_install) {
+  if (is_extension_install) {
     // Extensions that are not from the gallery are considered dangerous.
     ExtensionService* service = profile->GetExtensionService();
-    if (!service ||
-        !service->IsDownloadFromGallery(info->url(), info->referrer_url))
+    if (!service || !service->IsDownloadFromGallery(url, referrer_url))
       return true;
   }
   return false;
 }
 
 }  // namespace download_util