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>
 #endif
 #include <string>
 
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "base/win/windows_version.h"
+#include "chrome/browser/download/download_create_info.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_types.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/history/download_create_info.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ skipping 226 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) {
-  GenerateFileNameInternal(GURL(info->url()), info->content_disposition,
-                           info->referrer_charset, std::string(),
-                           info->mime_type, generated_name);
+void GenerateFileNameFromRequest(const GURL& url,
+                                 const std::string& content_disposition,
+                                 const std::string& referrer_charset,
+                                 const std::string& mime_type,
+                                 FilePath* generated_name) {
+  GenerateFileNameInternal(url,
+                           content_disposition,
+                           referrer_charset,
+                           std::string(),
+                           mime_type,
+                           generated_name);
 }
 
 void GenerateFileNameFromSuggestedName(const GURL& url,
                                        const std::string& suggested_name,
                                        const std::string& mime_type,
                                        FilePath* generated_name) {
   GenerateFileNameInternal(url, std::string(), std::string(),
                            suggested_name, mime_type, generated_name);
 }
 
@@ skipping 602 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