Modified cancel and interrupt processing to avoid race with history.

chrome/browser/ui/webui/active_downloads_ui.cc

 // Copyright (c) 2011 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/active_downloads_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 256 matching lines @@
 void ActiveDownloadsHandler::HandleAllowDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
   if (item)
     item->DangerousDownloadValidated();
 }
 
 void ActiveDownloadsHandler::HandleCancelDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
   if (item) {
     if (item->IsPartialDownload())
-      item->Cancel(true);
+      item->Cancel();
     item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
   }
 }
 
 bool ActiveDownloadsHandler::SelectTab(const GURL& url) {
   for (TabContentsIterator it; !it.done(); ++it) {
     TabContents* tab_contents = it->tab_contents();
     if (tab_contents->GetURL() == url) {
       static_cast<RenderViewHostDelegate*>(tab_contents)->Activate();
       return true;
@@ skipping 145 matching lines @@
         return (*it);
       }
     }
   }
   return NULL;
 }
 
 const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const {
   return handler_->downloads();
 }