Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/download/download_history.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 
 namespace history {
 struct DownloadRow;
 }  // namespace history
 
 // Observes a single DownloadManager and all its DownloadItems, keeping the
 // DownloadDatabase up to date.
 class DownloadHistory : public AllDownloadItemNotifier::Observer {
  public:
-  typedef std::set<uint32> IdSet;
+  typedef std::set<uint32_t> IdSet;
 
   // Caller must guarantee that HistoryService outlives HistoryAdapter.
   class HistoryAdapter {
    public:
     explicit HistoryAdapter(history::HistoryService* history);
     virtual ~HistoryAdapter();
 
     virtual void QueryDownloads(
         const history::HistoryService::DownloadQueryCallback& callback);
 
     virtual void CreateDownload(
         const history::DownloadRow& info,
         const history::HistoryService::DownloadCreateCallback& callback);
 
     virtual void UpdateDownload(const history::DownloadRow& data);
 
-    virtual void RemoveDownloads(const std::set<uint32>& ids);
+    virtual void RemoveDownloads(const std::set<uint32_t>& ids);
 
    private:
     history::HistoryService* history_;
     DISALLOW_COPY_AND_ASSIGN(HistoryAdapter);
   };
 
   class Observer {
    public:
     Observer();
     virtual ~Observer();
@@ skipping 43 matching lines @@
   // Callback from |history_| containing all entries in the downloads database
   // table.
   void QueryCallback(
       scoped_ptr<std::vector<history::DownloadRow> > infos);
 
   // May add |item| to |history_|.
   void MaybeAddToHistory(content::DownloadItem* item);
 
   // Callback from |history_| when an item was successfully inserted into the
   // database.
-  void ItemAdded(uint32 id, bool success);
+  void ItemAdded(uint32_t id, bool success);
 
   // AllDownloadItemNotifier::Observer
   void OnDownloadCreated(content::DownloadManager* manager,
                          content::DownloadItem* item) override;
   void OnDownloadUpdated(content::DownloadManager* manager,
                          content::DownloadItem* item) override;
   void OnDownloadOpened(content::DownloadManager* manager,
                         content::DownloadItem* item) override;
   void OnDownloadRemoved(content::DownloadManager* manager,
                          content::DownloadItem* item) override;
 
   // Schedule a record to be removed from |history_| the next time
   // RemoveDownloadsBatch() runs. Schedule RemoveDownloadsBatch() to be run soon
   // if it isn't already scheduled.
-  void ScheduleRemoveDownload(uint32 download_id);
+  void ScheduleRemoveDownload(uint32_t download_id);
 
   // Removes all |removing_ids_| from |history_|.
   void RemoveDownloadsBatch();
 
   AllDownloadItemNotifier notifier_;
 
   scoped_ptr<HistoryAdapter> history_;
 
   // Identifier of the item being created in QueryCallback(), matched up with
   // created items in OnDownloadCreated() so that the item is not re-added to
   // the database.
-  uint32 loading_id_;
+  uint32_t loading_id_;
 
   // Identifiers of items that are scheduled for removal from history, to
   // facilitate batching removals together for database efficiency.
   IdSet removing_ids_;
 
   // |GetId()|s of items that were removed while they were being added, so that
   // they can be removed when the database finishes adding them.
   // TODO(benjhayden) Can this be removed now that it doesn't need to wait for
   // the db_handle, and can rely on PostTask sequentiality?
   IdSet removed_while_adding_;
 
   // Count the number of items in the history for UMA.
-  int64 history_size_;
+  int64_t history_size_;
 
   base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<DownloadHistory> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadHistory);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_