Merge 60439 - Fix leak of a DownloadItem in SavePackage::Init....

chrome/browser/download/save_package.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/download/save_package.h"
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 351 matching lines @@
   // Initialize the request context and resource dispatcher.
   Profile* profile = tab_contents_->profile();
   if (!profile) {
     NOTREACHED();
     return false;
   }
 
   request_context_getter_ = profile->GetRequestContext();
 
   // Create the fake DownloadItem and display the view.
-  download_ = new DownloadItem(tab_contents_->profile()->GetDownloadManager(),
-                               saved_main_file_path_, page_url_,
+  DownloadManager* download_manager =
+      tab_contents_->profile()->GetDownloadManager();
+  download_ = new DownloadItem(download_manager,
+                               saved_main_file_path_,
+                               page_url_,
                                profile->IsOffTheRecord());
+
+  // Transfer the ownership to the download manager. We need the DownloadItem
+  // to be alive as long as the Profile is alive.
+  download_manager->SavePageAsDownloadStarted(download_);
+
   tab_contents_->OnStartDownload(download_);
 
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
     // Get directory
     DCHECK(!saved_main_directory_path_.empty());
     GetAllSavableResourceLinksForCurrentPage();
   } else {
     wait_state_ = NET_FILES;
     SaveFileCreateInfo::SaveFileSource save_source = page_url_.SchemeIsFile() ?
@@ skipping 985 matching lines @@
                                int index, void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   ContinueSave(save_params, path, index);
   delete save_params;
 }
 
 void SavePackage::FileSelectionCanceled(void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   delete save_params;
 }