Remove DownloadManager::GetDownloadItem in favor of GetDownload()

chrome/browser/ui/webui/downloads_dom_handler.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/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/basictypes.h"
@@ skipping 457 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()),
       base::Closure());
   // danger_prompt will delete itself.
   DCHECK(danger_prompt);
 }
 
 void DownloadsDOMHandler::DangerPromptAccepted(int download_id) {
   content::DownloadItem* item = NULL;
   if (main_notifier_.GetManager())
     item = main_notifier_.GetManager()->GetDownload(download_id);
-  if (original_notifier_.get() && original_notifier_->GetManager())
+  if (!item && original_notifier_.get() && original_notifier_->GetManager())
     item = original_notifier_->GetManager()->GetDownload(download_id);
-  if (!item)
+  if (!item || (item->GetState() != content::DownloadItem::IN_PROGRESS))
     return;
   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
   item->DangerousDownloadValidated();
 }
 
 content::DownloadItem* DownloadsDOMHandler::GetDownloadByValue(
     const base::ListValue* args) {
   int download_id = -1;
   if (!ExtractIntegerValue(args, &download_id))
     return NULL;
   content::DownloadItem* item = NULL;
   if (main_notifier_.GetManager())
     item = main_notifier_.GetManager()->GetDownload(download_id);
-  if (original_notifier_.get() && original_notifier_->GetManager())
+  if (!item && original_notifier_.get() && original_notifier_->GetManager())
     item = original_notifier_->GetManager()->GetDownload(download_id);
   return item;
 }
 
 content::WebContents* DownloadsDOMHandler::GetWebUIWebContents() {
   return web_ui()->GetWebContents();
 }
 
 void DownloadsDOMHandler::CallDownloadsList(const base::ListValue& downloads) {
   web_ui()->CallJavascriptFunction("downloadsList", downloads);
 }
 
 void DownloadsDOMHandler::CallDownloadUpdated(
     const base::ListValue& download_item) {
   web_ui()->CallJavascriptFunction("downloadUpdated", download_item);
 }