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

components/history/core/browser/android/android_history_types.h

Index: components/history/core/browser/android/android_history_types.h
diff --git a/components/history/core/browser/android/android_history_types.h b/components/history/core/browser/android/android_history_types.h
index 52906ce9673c186aeb84ec349865604ed1cb5257..41fad30356a76e6e9783fd648164abd70e5e86cf 100644
--- a/components/history/core/browser/android/android_history_types.h
+++ b/components/history/core/browser/android/android_history_types.h
@@ -5,8 +5,11 @@
 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_HISTORY_TYPES_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_HISTORY_TYPES_H_
 
+#include <stdint.h>
+
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/keyword_id.h"
@@ -17,8 +20,8 @@ class Statement;
 
 namespace history {
 
-typedef int64 AndroidURLID;
-typedef int64 SearchTermID;
+typedef int64_t AndroidURLID;
+typedef int64_t SearchTermID;
 
 // Wraps all columns needed to support android.provider.Browser.BookmarkColumns.
 // It is used in insert() and update() to specify the columns need to insert or
@@ -120,11 +123,11 @@ class HistoryAndBookmarkRow {
   AndroidURLID id() const { return id_; }
 
   // The id of the parent folder containing the bookmark, if any.
-  void set_parent_id(int64 parent_id) {
+  void set_parent_id(int64_t parent_id) {
     set_value_explicitly(PARENT_ID);
     parent_id_ = parent_id;
   }
-  const int64 parent_id() const { return parent_id_; }
+  const int64_t parent_id() const { return parent_id_; }
 
   // The internal URLID
   void set_url_id(URLID url_id) {
@@ -150,7 +153,7 @@ class HistoryAndBookmarkRow {
   scoped_refptr<base::RefCountedMemory> favicon_;
   int visit_count_;
   bool is_bookmark_;
-  int64 parent_id_;
+  int64_t parent_id_;
   URLID url_id_;
 
   // Used to find whether a column has been set a value explicitly.