OnDownloadStarted takes DownloadItem* instead of DownloadId

chrome/browser/plugins/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/plugins/plugin_installer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/process.h"
@@ skipping 42 matching lines @@
       resource_context,
       render_process_host_id,
       render_view_host_routing_id,
       true,  // prefer_cache
       content::DownloadSaveInfo(),
       callback);
 
   if (error != net::OK) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(callback, content::DownloadId::Invalid(), error));
+        base::Bind(callback, static_cast<DownloadItem*>(NULL), error));
   }
 }
 
 }  // namespace
 
 PluginInstaller::PluginInstaller()
     : state_(INSTALLER_STATE_IDLE) {
 }
 
 PluginInstaller::~PluginInstaller() {
@@ skipping 74 matching lines @@
                  tab_contents->profile()->GetResourceContext(),
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID(),
                  base::Bind(&PluginInstaller::DownloadStarted,
                             base::Unretained(this),
                             make_scoped_refptr(download_manager))));
 }
 
 void PluginInstaller::DownloadStarted(
     scoped_refptr<content::DownloadManager> dlm,
-    content::DownloadId download_id,
+    content::DownloadItem* item,
     net::Error error) {
-  if (error != net::OK) {
+  if (!item) {
+    DCHECK_NE(net::OK, error);
     std::string msg =
         base::StringPrintf("Error %d: %s", error, net::ErrorToString(error));
     DownloadError(msg);
     return;
   }
-  DownloadItem* download_item = dlm->GetDownload(download_id.local());
-  // TODO(benjhayden): DCHECK(item && item->IsInProgress()) after figuring out
-  // why DownloadStarted may get net:OK but an invalid id.
-  if (!download_item) {
-    DownloadError("Download not found");
-    return;
-  }
-  download_item->SetOpenWhenComplete(true);
-  download_item->AddObserver(this);
+  DCHECK_EQ(net::OK, error);
+  item->SetOpenWhenComplete(true);
+  item->AddObserver(this);
 }
 
 void PluginInstaller::OpenDownloadURL(bool url_for_display,
                                       const GURL& plugin_url,
                                       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(),
                         WebKit::WebReferrerPolicyDefault),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false));
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished());
 }
 
 void PluginInstaller::DownloadError(const std::string& msg) {
   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());
 }