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

components/undo/bookmark_undo_service.cc

 // Copyright 2013 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/undo/bookmark_undo_service.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/bookmarks/browser/bookmark_undo_provider.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "components/undo/undo_operation.h"
 #include "grit/components_strings.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
@@ skipping 27 matching lines @@
                        const BookmarkNode* parent,
                        int index);
   ~BookmarkAddOperation() override {}
 
   // UndoOperation:
   void Undo() override;
   int GetUndoLabelId() const override;
   int GetRedoLabelId() const override;
 
  private:
-  int64 parent_id_;
+  int64_t parent_id_;
   const int index_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkAddOperation);
 };
 
 BookmarkAddOperation::BookmarkAddOperation(
     BookmarkModel* bookmark_model,
     const BookmarkNode* parent,
     int index)
     : BookmarkUndoOperation(bookmark_model),
@@ skipping 89 matching lines @@
   BookmarkEditOperation(BookmarkModel* bookmark_model,
                         const BookmarkNode* node);
   ~BookmarkEditOperation() override {}
 
   // UndoOperation:
   void Undo() override;
   int GetUndoLabelId() const override;
   int GetRedoLabelId() const override;
 
  private:
-  int64 node_id_;
+  int64_t node_id_;
   BookmarkNodeData original_bookmark_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditOperation);
 };
 
 BookmarkEditOperation::BookmarkEditOperation(
     BookmarkModel* bookmark_model,
     const BookmarkNode* node)
     : BookmarkUndoOperation(bookmark_model),
       node_id_(node->id()),
@@ skipping 30 matching lines @@
                         const BookmarkNode* new_parent,
                         int new_index);
   ~BookmarkMoveOperation() override {}
   int GetUndoLabelId() const override;
   int GetRedoLabelId() const override;
 
   // UndoOperation:
   void Undo() override;
 
  private:
-  int64 old_parent_id_;
-  int64 new_parent_id_;
+  int64_t old_parent_id_;
+  int64_t new_parent_id_;
   int old_index_;
   int new_index_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMoveOperation);
 };
 
 BookmarkMoveOperation::BookmarkMoveOperation(
     BookmarkModel* bookmark_model,
     const BookmarkNode* old_parent,
     int old_index,
@@ skipping 46 matching lines @@
   BookmarkReorderOperation(BookmarkModel* bookmark_model,
                            const BookmarkNode* parent);
   ~BookmarkReorderOperation() override;
 
   // UndoOperation:
   void Undo() override;
   int GetUndoLabelId() const override;
   int GetRedoLabelId() const override;
 
  private:
-  int64 parent_id_;
-  std::vector<int64> ordered_bookmarks_;
+  int64_t parent_id_;
+  std::vector<int64_t> ordered_bookmarks_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkReorderOperation);
 };
 
 BookmarkReorderOperation::BookmarkReorderOperation(
     BookmarkModel* bookmark_model,
     const BookmarkNode* parent)
     : BookmarkUndoOperation(bookmark_model),
       parent_id_(parent->id()) {
   ordered_bookmarks_.resize(parent->child_count());
@@ skipping 105 matching lines @@
 
 void BookmarkUndoService::OnBookmarkNodeRemoved(BookmarkModel* model,
                                                 const BookmarkNode* parent,
                                                 int index,
                                                 scoped_ptr<BookmarkNode> node) {
   DCHECK(undo_provider_);
   scoped_ptr<UndoOperation> op(new BookmarkRemoveOperation(
       model, undo_provider_, parent, index, node.Pass()));
   undo_manager()->AddUndoOperation(op.Pass());
 }