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

components/history/core/browser/android/android_history_types.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 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"
 
 namespace sql {
 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
 // update.
 // The column is not valid until it set. Using is_valid() to find out whether
 // the specific column could be used.
 //
 // The defult copy constructor is used.
 class HistoryAndBookmarkRow {
  public:
@@ skipping 81 matching lines @@
   bool favicon_valid() const { return favicon_.get() && favicon_->size(); }
 
   // The id of android url.
   void set_id(AndroidURLID id) {
     set_value_explicitly(ID);
     id_ = id;
   }
   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) {
     set_value_explicitly(URL_ID);
     url_id_ = url_id;
   }
   URLID url_id() const { return url_id_; }
 
   // Returns true if the given |id| has been set explicitly.
   bool is_value_set_explicitly(ColumnID id) const {
     return values_set_.find(id) != values_set_.end();
   }
 
  private:
   void set_value_explicitly(ColumnID id) { values_set_.insert(id); }
 
   AndroidURLID id_;
   GURL url_;
   std::string raw_url_;
   base::string16 title_;
   base::Time created_;
   base::Time last_visit_time_;
   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.
   std::set<ColumnID> values_set_;
 
   // We support the implicit copy constuctor and operator=.
 };
 
 // Wraps all columns needed to support android.provider.Browser.SearchColumns.
 // It is used in insert() and update() to specify the columns need to insert or
@@ skipping 111 matching lines @@
  private:
   scoped_ptr<sql::Statement> statement_;
   int favicon_index_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidStatement);
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_HISTORY_TYPES_H_