Revert 102126 - Make cancel remove cancelled download from active queues at time of cancel.

content/browser/download/download_manager_delegate.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_DELEGATE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 66 matching lines @@
   virtual void UpdateItemInPersistentStore(DownloadItem* item) = 0;
 
   // Notifies the delegate that path for the download item has changed, so that
   // it can update its persistent store.
   virtual void UpdatePathForItemInPersistentStore(
       DownloadItem* item,
       const FilePath& new_path) = 0;
 
   // Notifies the delegate that it should remove the download item from its
   // persistent store.
-  virtual void RemoveItemFromPersistentStore(int64 db_handle) = 0;
+  virtual void RemoveItemFromPersistentStore(DownloadItem* item) = 0;
 
   // Notifies the delegate to remove downloads from the given time range.
   virtual void RemoveItemsFromPersistentStoreBetween(
       const base::Time remove_begin,
       const base::Time remove_end) = 0;
 
   // Retrieve the directories to save html pages and downloads to.
   virtual void GetSaveDir(TabContents* tab_contents,
                           FilePath* website_save_dir,
                           FilePath* download_save_dir) = 0;
 
   // Asks the user for the path to save a page. The delegate calls
   // SavePackage::OnPathPicked to give the answer.
   virtual void ChooseSavePath(const base::WeakPtr<SavePackage>& save_package,
                               const FilePath& suggested_path,
                               bool can_save_as_complete) = 0;
 
   // Informs the delegate that the progress of downloads has changed.
   virtual void DownloadProgressUpdated() = 0;
 
  protected:
   DownloadManagerDelegate() {}
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerDelegate);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_DELEGATE_H_