| Index: chrome/browser/download/download_history.cc
|
| diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc
|
| index becc0e55a9b176f50e096857a088c1eac42359dc..c04df4b85b50e915f046cad1cb9ac8718b9f1c6f 100644
|
| --- a/chrome/browser/download/download_history.cc
|
| +++ b/chrome/browser/download/download_history.cc
|
| @@ -28,6 +28,7 @@
|
|
|
| #include "chrome/browser/download/download_history.h"
|
|
|
| +#include "base/macros.h"
|
| #include "base/metrics/histogram.h"
|
| #include "chrome/browser/download/download_crx_util.h"
|
| #include "components/history/content/browser/download_constants_utils.h"
|
| @@ -192,7 +193,7 @@ void DownloadHistory::HistoryAdapter::UpdateDownload(
|
| }
|
|
|
| void DownloadHistory::HistoryAdapter::RemoveDownloads(
|
| - const std::set<uint32>& ids) {
|
| + const std::set<uint32_t>& ids) {
|
| history_->RemoveDownloads(ids);
|
| }
|
|
|
| @@ -295,7 +296,7 @@ void DownloadHistory::QueryCallback(scoped_ptr<InfoVector> infos) {
|
| void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| - uint32 download_id = item->GetId();
|
| + uint32_t download_id = item->GetId();
|
| DownloadHistoryData* data = DownloadHistoryData::Get(item);
|
| bool removing = removing_ids_.find(download_id) != removing_ids_.end();
|
|
|
| @@ -321,7 +322,7 @@ void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
|
| item, *data->info()));
|
| }
|
|
|
| -void DownloadHistory::ItemAdded(uint32 download_id, bool success) {
|
| +void DownloadHistory::ItemAdded(uint32_t download_id, bool success) {
|
| if (removed_while_adding_.find(download_id) !=
|
| removed_while_adding_.end()) {
|
| removed_while_adding_.erase(download_id);
|
| @@ -444,7 +445,7 @@ void DownloadHistory::OnDownloadRemoved(
|
| --history_size_;
|
| }
|
|
|
| -void DownloadHistory::ScheduleRemoveDownload(uint32 download_id) {
|
| +void DownloadHistory::ScheduleRemoveDownload(uint32_t download_id) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| // For database efficiency, batch removals together if they happen all at
|
|
|