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

components/bookmarks/browser/bookmark_node.cc

 // 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.
 
 #include "components/bookmarks/browser/bookmark_node.h"
 
 #include <map>
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace bookmarks {
 
 namespace {
 
 // Whitespace characters to strip from bookmark titles.
 const base::char16 kInvalidChars[] = {
   '\n', '\r', '\t',
   0x2028,  // Line separator
   0x2029,  // Paragraph separator
   0
 };
 
 }  // namespace
 
 // BookmarkNode ---------------------------------------------------------------
 
-const int64 BookmarkNode::kInvalidSyncTransactionVersion = -1;
+const int64_t BookmarkNode::kInvalidSyncTransactionVersion = -1;
 
 BookmarkNode::BookmarkNode(const GURL& url)
     : url_(url) {
   Initialize(0);
 }
 
-BookmarkNode::BookmarkNode(int64 id, const GURL& url)
-    : url_(url) {
+BookmarkNode::BookmarkNode(int64_t id, const GURL& url) : url_(url) {
   Initialize(id);
 }
 
 BookmarkNode::~BookmarkNode() {
 }
 
 void BookmarkNode::SetTitle(const base::string16& title) {
   // Replace newlines and other problematic whitespace characters in
   // folder/bookmark names with spaces.
   base::string16 trimmed_title;
@@ skipping 49 matching lines @@
   if (meta_info_map.empty())
     meta_info_map_.reset();
   else
     meta_info_map_.reset(new MetaInfoMap(meta_info_map));
 }
 
 const BookmarkNode::MetaInfoMap* BookmarkNode::GetMetaInfoMap() const {
   return meta_info_map_.get();
 }
 
-void BookmarkNode::Initialize(int64 id) {
+void BookmarkNode::Initialize(int64_t id) {
   id_ = id;
   type_ = url_.is_empty() ? FOLDER : URL;
   date_added_ = base::Time::Now();
   favicon_type_ = favicon_base::INVALID_ICON;
   favicon_state_ = INVALID_FAVICON;
   favicon_load_task_id_ = base::CancelableTaskTracker::kBadTaskId;
   meta_info_map_.reset();
   sync_transaction_version_ = kInvalidSyncTransactionVersion;
 }
 
 void BookmarkNode::InvalidateFavicon() {
   icon_url_ = GURL();
   favicon_ = gfx::Image();
   favicon_type_ = favicon_base::INVALID_ICON;
   favicon_state_ = INVALID_FAVICON;
 }
 
 // BookmarkPermanentNode -------------------------------------------------------
 
-BookmarkPermanentNode::BookmarkPermanentNode(int64 id)
-    : BookmarkNode(id, GURL()),
-      visible_(true) {
-}
+BookmarkPermanentNode::BookmarkPermanentNode(int64_t id)
+    : BookmarkNode(id, GURL()), visible_(true) {}
 
 BookmarkPermanentNode::~BookmarkPermanentNode() {
 }
 
 bool BookmarkPermanentNode::IsVisible() const {
   return visible_ || !empty();
 }
 
 }  // namespace bookmarks