OnDownloadStarted takes DownloadItem* instead of DownloadId

chrome/browser/extensions/webstore_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/extensions/webstore_installer.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
-using content::DownloadId;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::NavigationController;
 using content::DownloadUrlParameters;
 
 namespace {
 
 // Key used to attach the Approval to the DownloadItem.
 const char kApprovalKey[] = "extensions.webstore_installer";
 
@@ skipping 213 matching lines @@
   g_download_directory_for_tests = directory;
 }
 
 WebstoreInstaller::~WebstoreInstaller() {
   if (download_item_) {
     download_item_->RemoveObserver(this);
     download_item_ = NULL;
   }
 }
 
-void WebstoreInstaller::OnDownloadStarted(DownloadId id, net::Error error) {
-  if (error != net::OK) {
+void WebstoreInstaller::OnDownloadStarted(
+    DownloadItem* item, net::Error error) {
+  if (!item) {
+    DCHECK_NE(net::OK, error);
     ReportFailure(net::ErrorToString(error), FAILURE_REASON_OTHER);
     return;
   }
 
-  CHECK(id.IsValid());
-
-  DownloadManager* download_manager =
-      BrowserContext::GetDownloadManager(profile_);
-  if (!download_manager)
-    return;
-  download_item_ = download_manager->GetDownload(id.local());
-  // TODO(benjhayden): DCHECK(item && item->IsInProgress()) after investigating
-  // the relationship between net::OK and invalid id.
-  if (download_item_) {
-    download_item_->AddObserver(this);
-    if (approval_.get())
-      download_item_->SetUserData(kApprovalKey, approval_.release());
-    if (delegate_)
-      delegate_->OnExtensionDownloadStarted(id_, download_item_);
-  }
+  DCHECK_EQ(net::OK, error);
+  download_item_ = item;
+  download_item_->AddObserver(this);
+  if (approval_.get())
+    download_item_->SetUserData(kApprovalKey, approval_.release());
+  if (delegate_)
+    delegate_->OnExtensionDownloadStarted(id_, download_item_);
 }
 
 void WebstoreInstaller::OnDownloadUpdated(DownloadItem* download) {
   CHECK_EQ(download_item_, download);
 
   switch (download->GetState()) {
     case DownloadItem::CANCELLED:
       ReportFailure(kDownloadCanceledError, FAILURE_REASON_CANCELLED);
       break;
     case DownloadItem::INTERRUPTED:
@@ skipping 71 matching lines @@
 void WebstoreInstaller::ReportSuccess() {
   if (delegate_) {
     delegate_->OnExtensionInstallSuccess(id_);
     delegate_ = NULL;
   }
 
   Release();  // Balanced in Start().
 }
 
 }  // namespace extensions