Revert 149794 - DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

content/browser/download/save_package.cc

 // Copyright (c) 2012 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 "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 1340 matching lines @@
 
 void SavePackage::StopObservation() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_->RemoveObserver(this);
   download_ = NULL;
   download_manager_ = NULL;
 }
 
-void SavePackage::OnDownloadDestroyed(DownloadItem* download) {
-  StopObservation();
+void SavePackage::OnDownloadUpdated(DownloadItem* download) {
+  DCHECK(download_);
+  DCHECK(download_ == download);
+  DCHECK(download_manager_);
+
+  // Check for removal.
+  if (download_->GetState() == DownloadItem::REMOVING) {
+    StopObservation();
+  }
 }
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->SavePageDownloadFinished(download_);
   StopObservation();
 }