Switch to standard integer types in components/, part 2 of 4.

components/history/core/browser/history_types.h

 // Copyright 2014 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 COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_TYPES_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_TYPES_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/stack_container.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/history_context.h"
 #include "components/history/core/browser/url_row.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 namespace history {
 
 // Forward declaration for friend statements.
 class HistoryBackend;
 class PageUsageData;
 class URLDatabase;
 
 // Container for a list of URLs.
 typedef std::vector<GURL> RedirectList;
 
-typedef int64 FaviconBitmapID; // Identifier for a bitmap in a favicon.
-typedef int64 SegmentID;  // URL segments for the most visited view.
-typedef int64 IconMappingID; // For page url and icon mapping.
+typedef int64_t FaviconBitmapID;  // Identifier for a bitmap in a favicon.
+typedef int64_t SegmentID;        // URL segments for the most visited view.
+typedef int64_t IconMappingID;    // For page url and icon mapping.
 
 // The enumeration of all possible sources of visits is listed below.
 // The source will be propagated along with a URL or a visit item
 // and eventually be stored in the history database,
 // visit_source table specifically.
 // Different from page transition types, they describe the origins of visits.
 // (Warning): Please don't change any existing values while it is ok to add
 // new values when needed.
 enum VisitSource {
   SOURCE_SYNCED = 0,         // Synchronized from somewhere else.
   SOURCE_BROWSED = 1,        // User browsed.
   SOURCE_EXTENSION = 2,      // Added by an extension.
   SOURCE_FIREFOX_IMPORTED = 3,
   SOURCE_IE_IMPORTED = 4,
   SOURCE_SAFARI_IMPORTED = 5,
 };
 
-typedef int64 VisitID;
+typedef int64_t VisitID;
 // Structure to hold the mapping between each visit's id and its source.
 typedef std::map<VisitID, VisitSource> VisitSourceMap;
 
 // VisitRow -------------------------------------------------------------------
 
 // Holds all information associated with a specific visit. A visit holds time
 // and referrer information for one time a URL is visited.
 class VisitRow {
  public:
   VisitRow();
@@ skipping 195 matching lines @@
     KEEP_ALL_DUPLICATES
   };
 
   // Allows the caller to specify how duplicate URLs in the result set should
   // be handled. The default is REMOVE_DUPLICATES.
   DuplicateHandling duplicate_policy;
 
   // Helpers to get the effective parameters values, since a value of 0 means
   // "unspecified".
   int EffectiveMaxCount() const;
-  int64 EffectiveBeginTime() const;
-  int64 EffectiveEndTime() const;
+  int64_t EffectiveBeginTime() const;
+  int64_t EffectiveEndTime() const;
 };
 
 // QueryURLResult -------------------------------------------------------------
 
 // QueryURLResult encapsulates the result of a call to HistoryBackend::QueryURL.
 struct QueryURLResult {
   QueryURLResult();
   ~QueryURLResult();
 
   // Indicates whether the call to HistoryBackend::QueryURL was successfull
@@ skipping 46 matching lines @@
 
 // Holds the per-URL information of the filterd url query.
 struct FilteredURL {
   struct ExtendedInfo {
     ExtendedInfo();
     // The absolute number of visits.
     unsigned int total_visits;
     // The number of visits, as seen by the Most Visited NTP pane.
     unsigned int visits;
     // The total number of seconds that the page was open.
-    int64 duration_opened;
+    int64_t duration_opened;
     // The time when the page was last visited.
     base::Time last_visit_time;
   };
 
   FilteredURL();
   explicit FilteredURL(const PageUsageData& data);
   ~FilteredURL();
 
   GURL url;
   base::string16 title;
@@ skipping 180 matching lines @@
   void SetTimeRangeForOneDay(base::Time time);
 
   std::set<GURL> urls;
   base::Time begin_time;
   base::Time end_time;
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_TYPES_H_