Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

chrome/browser/plugin_installer.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 "chrome/browser/plugin_installer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/process.h"
@@ skipping 132 matching lines @@
       DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
       state_ = INSTALLER_STATE_IDLE;
       FOR_EACH_OBSERVER(PluginInstallerObserver, observers_,
                         DownloadFinished());
       break;
     }
     case DownloadItem::CANCELLED: {
       DownloadCancelled();
       break;
     }
-    case DownloadItem::REMOVING: {
-      DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
-      state_ = INSTALLER_STATE_IDLE;
-      break;
-    }
     case DownloadItem::INTERRUPTED: {
       content::DownloadInterruptReason reason = download->GetLastReason();
       DownloadError(content::InterruptReasonDebugString(reason));
       break;
     }
     case DownloadItem::MAX_DOWNLOAD_STATE: {
       NOTREACHED();
       return;
     }
   }
   download->RemoveObserver(this);
 }
 
-void PluginInstaller::OnDownloadOpened(DownloadItem* download) {
+void PluginInstaller::OnDownloadDestroyed(DownloadItem* download) {
+  DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
+  state_ = INSTALLER_STATE_IDLE;
+  download->RemoveObserver(this);
 }
 
 void PluginInstaller::AddObserver(PluginInstallerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void PluginInstaller::RemoveObserver(PluginInstallerObserver* observer) {
   observers_.RemoveObserver(observer);
   if (observers_.size() == weak_observers_.size()) {
     FOR_EACH_OBSERVER(WeakPluginInstallerObserver, weak_observers_,
@@ skipping 63 matching lines @@
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg));
 }
 
 void PluginInstaller::DownloadCancelled() {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
 }