Remove DownloadManager::GetDownloadItem in favor of GetDownload()

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 207 matching lines @@
 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);
     return;
   }
-  DownloadItem* download_item =
-      dlm->GetActiveDownloadItem(download_id.local());
+  DownloadItem* download_item = dlm->GetDownload(download_id.local());

[Randy Smith (Not in Mondays), 2012/09/13 18:52:44]

I'd be inclined to put a DCHECK after this that we're in IN_PROGRESS.

[benjhayden, 2012/09/13 20:19:36]

TODone, see response to below comment.

+  if (!download_item) {
+    DownloadError("Download not found");
+    return;

[Randy Smith (Not in Mondays), 2012/09/13 18:52:44]

Why the addition of the error return?  GetDownload() will return NULL in fewer
cases than GetActiveDownloadItem.

[benjhayden, 2012/09/13 20:19:36]

We saw in WebstoreInstaller where the DownloadStarted callback may be called
with net::OK but an invalid id. This is just defensive programming while we hunt
that bug down. I'll add a TODO to turn it into a DCHECK when possible.

+  }
   download_item->SetOpenWhenComplete(true);
   download_item->AddObserver(this);
 }
 
 void PluginInstaller::OpenDownloadURL(content::WebContents* web_contents) {
   DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
   DCHECK(url_for_display_);
   web_contents->OpenURL(content::OpenURLParams(
       plugin_url_,
       content::Referrer(web_contents->GetURL(),
@@ skipping 10 matching lines @@
 
 void PluginInstaller::DownloadCancelled() {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
 }
 
 bool PluginInstaller::MatchesPlugin(const webkit::WebPluginInfo& plugin) {
   return plugin.name.find(group_name_matcher_) != string16::npos;
 }