Modified cancel and interrupt processing to avoid race with history.

chrome/browser/download/download_item_model.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/download/download_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/time_format.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::TimeDelta;
 
 // -----------------------------------------------------------------------------
 // DownloadItemModel
 
 DownloadItemModel::DownloadItemModel(DownloadItem* download)
     : BaseDownloadItemModel(download) {
 }
 
 void DownloadItemModel::CancelTask() {
-  download_->Cancel(true /* update history service */);
+  download_->Cancel();
 }
 
 string16 DownloadItemModel::GetStatusText() {
   int64 size = download_->received_bytes();
   int64 total = download_->total_bytes();
 
   DataUnits amount_units = GetByteDisplayUnits(total);
   const string16 simple_size = FormatBytes(size, amount_units, false);
 
   // In RTL locales, we render the text "size/total" in an RTL context. This
@@ skipping 104 matching lines @@
           IDS_SAVE_PAGE_STATUS_INTERRUPTED,
           base::FormatNumber(size),
           base::FormatNumber(total_size));
       break;
     default:
       NOTREACHED();
   }
 
   return status_text;
 }