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 22 matching lines @@
       download_util::INITIATED_BY_PLUGIN_INSTALLER);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
                  plugin_url_,
                  tab_contents->profile()->GetResourceContext(),
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID(),
                  base::Bind(&PluginInstaller::DownloadStarted,
                             base::Unretained(this),
                             make_scoped_refptr(download_manager))));

[Randy Smith (Not in Mondays), 2012/07/11 17:55:37]

*Not* relevant to this CL, but this code makes it look like it would be easy to
get rid of the call to RDH::BeginDownload() above if we wanted.

[benjhayden, 2012/07/13 20:03:17]

The more downloads code we rediscover, the more of it we want to fix. :-)

 }
 
 void PluginInstaller::DownloadStarted(
     scoped_refptr<content::DownloadManager> dlm,
     content::DownloadId download_id,
     net::Error error) {
   if (error != net::OK) {
     std::string msg =
         base::StringPrintf("Error %d: %s", error, net::ErrorToString(error));
     DownloadError(msg);
@@ skipping 20 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());
 }