[Sync] Make BookmarkChangeProcessor resilient against updates before add

chrome/browser/sync/glue/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 CHROME_BROWSER_SYNC_GLUE_BOOKMARK_CHANGE_PROCESSOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_CHANGE_PROCESSOR_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 115 matching lines @@
   // 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 BookmarkNode* parent,
                               BookmarkModel* model,
                               int index,
                               syncer::WriteTransaction* trans,
                               BookmarkModelAssociator* associator,
                               DataTypeErrorHandler* error_handler);
 
+  // Update |bookmark_node|'s sync node.
+  static int64 UpdateSyncNode(const BookmarkNode* bookmark_node,
+                              BookmarkModel* model,
+                              syncer::WriteTransaction* trans,
+                              BookmarkModelAssociator* associator,
+                              DataTypeErrorHandler* error_handler);
+
   // Update transaction version of |model| and |nodes| to |new_version| if
   // it's valid.
   static void UpdateTransactionVersion(
       int64 new_version,
       BookmarkModel* model,
       const std::vector<const BookmarkNode*>& nodes);
 
  protected:
   virtual void StartImpl() OVERRIDE;
 
@@ skipping 43 matching lines @@
   void RemoveAllSyncNodes();
 
   // Remove all children of the bookmark node with bookmark node id:
   // |topmost_node_id|.
   void RemoveAllChildNodes(syncer::WriteTransaction* trans,
                            const int64& topmost_node_id);
 
   // Remove all the sync nodes associated with |node| and its children.
   void RemoveSyncNodeHierarchy(const BookmarkNode* node);
 
+  // Creates or updates a sync node associated with |node|.
+  void CreateOrUpdateSyncNode(const BookmarkNode* node);
+
   // The bookmark model we are processing changes from.  Non-NULL when
   // |running_| is true.
   BookmarkModel* bookmark_model_;
 
   Profile* profile_;
 
   // The two models should be associated according to this ModelAssociator.
   BookmarkModelAssociator* model_associator_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkChangeProcessor);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_CHANGE_PROCESSOR_H_