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

components/sync_bookmarks/bookmark_change_processor.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_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_
 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/sync_bookmarks/bookmark_model_associator.h"
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/data_type_error_handler.h"
 
 class Profile;
 
 namespace base {
@@ skipping 54 matching lines @@
   void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
                                   const bookmarks::BookmarkNode* node) override;
   void BookmarkNodeChildrenReordered(
       bookmarks::BookmarkModel* model,
       const bookmarks::BookmarkNode* node) override;
 
   // The change processor implementation, responsible for applying changes from
   // the sync model to the bookmarks model.
   void ApplyChangesFromSyncModel(
       const syncer::BaseTransaction* trans,
-      int64 model_version,
+      int64_t model_version,
       const syncer::ImmutableChangeRecordList& changes) override;
 
   // The following methods are static and hence may be invoked at any time, and
   // do not depend on having a running ChangeProcessor.
   // TODO(stanisc): considier refactoring these methods out of this class.
 
   // Updates the title, URL, creation time and favicon of the bookmark |node|
   // with data taken from the |sync_node| sync node.
   static void UpdateBookmarkWithSyncData(const syncer::BaseNode& sync_node,
                                          bookmarks::BookmarkModel* model,
@@ skipping 42 matching lines @@
   // Sets the favicon of the given sync node from the given bookmark node.
   static void SetSyncNodeFavicon(const bookmarks::BookmarkNode* bookmark_node,
                                  bookmarks::BookmarkModel* model,
                                  syncer::WriteNode* sync_node);
 
   // Treat the |index|th child of |parent| as a newly added node, and create a
   // corresponding node in the sync domain using |trans|.  All properties
   // will be transferred to the new node.  A node corresponding to |parent|
   // must already exist and be associated for this call to succeed.  Returns
   // the ID of the just-created node, or if creation fails, kInvalidID.
-  static int64 CreateSyncNode(const bookmarks::BookmarkNode* parent,
-                              bookmarks::BookmarkModel* model,
-                              int index,
-                              syncer::WriteTransaction* trans,
-                              BookmarkModelAssociator* associator,
-                              sync_driver::DataTypeErrorHandler* error_handler);
+  static int64_t CreateSyncNode(
+      const bookmarks::BookmarkNode* parent,
+      bookmarks::BookmarkModel* model,
+      int index,
+      syncer::WriteTransaction* trans,
+      BookmarkModelAssociator* associator,
+      sync_driver::DataTypeErrorHandler* error_handler);
 
   // Update |bookmark_node|'s sync node.
-  static int64 UpdateSyncNode(const bookmarks::BookmarkNode* bookmark_node,
-                              bookmarks::BookmarkModel* model,
-                              syncer::WriteTransaction* trans,
-                              BookmarkModelAssociator* associator,
-                              sync_driver::DataTypeErrorHandler* error_handler);
+  static int64_t UpdateSyncNode(
+      const bookmarks::BookmarkNode* bookmark_node,
+      bookmarks::BookmarkModel* model,
+      syncer::WriteTransaction* trans,
+      BookmarkModelAssociator* associator,
+      sync_driver::DataTypeErrorHandler* error_handler);
 
   // Tombstone |topmost_sync_node| node and all its children in the sync domain
   // using transaction |trans|. Returns the number of removed nodes.
   static int RemoveSyncNodeHierarchy(syncer::WriteTransaction* trans,
                                      syncer::WriteNode* topmost_sync_node,
                                      BookmarkModelAssociator* associator);
 
   // Update transaction version of |model| and |nodes| to |new_version| if
   // it's valid.
   static void UpdateTransactionVersion(
-      int64 new_version,
+      int64_t new_version,
       bookmarks::BookmarkModel* model,
       const std::vector<const bookmarks::BookmarkNode*>& nodes);
 
  protected:
   void StartImpl() override;
 
  private:
   enum MoveOrCreate {
     MOVE,
     CREATE,
@@ skipping 36 matching lines @@
 
   // Remove all sync nodes, except the permanent nodes.
   void RemoveAllSyncNodes();
 
   // Remove all the sync nodes associated with |node| and its children.
   void RemoveSyncNodeHierarchy(const bookmarks::BookmarkNode* node);
 
   // Remove all children of |sync_node|. Returns the number of removed
   // children.
   static int RemoveAllChildNodes(syncer::WriteTransaction* trans,
-                                 int64 sync_id,
+                                 int64_t sync_id,
                                  BookmarkModelAssociator* associator);
 
   // Remove |sync_node|. It should not have any children.
   static void RemoveOneSyncNode(syncer::WriteNode* sync_node,
                                 BookmarkModelAssociator* associator);
 
   // Creates or updates a sync node associated with |node|.
   void CreateOrUpdateSyncNode(const bookmarks::BookmarkNode* node);
 
   // Returns false if |node| should not be synced.
   bool CanSyncNode(const bookmarks::BookmarkNode* node);
 
   base::ThreadChecker thread_checker_;
 
   // The bookmark model we are processing changes from.  Non-NULL when
   // |running_| is true.
   bookmarks::BookmarkModel* bookmark_model_;
 
   sync_driver::SyncClient* sync_client_;
 
   // The two models should be associated according to this ModelAssociator.
   BookmarkModelAssociator* model_associator_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkChangeProcessor);
 };
 
 }  // namespace browser_sync
 
 #endif  // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_