Use delete journal to remove bookmarks that are already deleted in sync model

chrome/browser/sync/glue/bookmark_model_associator.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_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 class BookmarkModel;
 class BookmarkNode;
 
 namespace syncer {
 class BaseNode;
+class BaseTransaction;
 struct UserShare;
 }
 
 namespace browser_sync {
 
 // Contains all model association related logic:
 // * Algorithm to associate bookmark model and sync model.
 // * Methods to get a bookmark node for a given sync node and vice versa.
 // * Persisting model associations and loading them back.
 class BookmarkModelAssociator
@@ skipping 76 matching lines @@
   void PostPersistAssociationsTask();
   // Persists all dirty associations.
   void PersistAssociations();
 
   // Matches up the bookmark model and the sync model to build model
   // associations.
   syncer::SyncError BuildAssociations(
       syncer::SyncMergeResult* local_merge_result,
       syncer::SyncMergeResult* syncer_merge_result);
 
+  // Removes bookmark nodes whose corresponding sync nodes have been deleted
+  // according to sync delete journals. Return number of such bookmarks nodes
+  // found.
+  int64 ApplyDeletesFromSyncJournal(syncer::BaseTransaction* trans);
+
   // Associate a top-level node of the bookmark model with a permanent node in
   // the sync domain.  Such permanent nodes are identified by a tag that is
   // well known to the server and the client, and is unique within a particular
   // user's share.  For example, "other_bookmarks" is the tag for the Other
   // Bookmarks folder.  The sync nodes are server-created.
   // Returns true on success, false if association failed.
   bool AssociateTaggedPermanentNode(
       const BookmarkNode* permanent_node,
       const std::string& tag) WARN_UNUSED_RESULT;
 
@@ skipping 18 matching lines @@
   // guarantees no invocations can occur if |this| has been deleted. (This
   // allows this class to be non-refcounted).
   base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_