Reland 87645 with clang fixes.

chrome/browser/sync/glue/bookmark_model_associator.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 34 matching lines @@
 
   // AssociatorInterface implementation.
   //
   // AssociateModels iterates through both the sync and the browser
   // bookmark model, looking for matched pairs of items.  For any pairs it
   // finds, it will call AssociateSyncID.  For any unmatched items,
   // MergeAndAssociateModels will try to repair the match, e.g. by adding a new
   // node.  After successful completion, the models should be identical and
   // corresponding. Returns true on success.  On failure of this step, we
   // should abort the sync operation and report an error to the user.
-  virtual bool AssociateModels();
+  virtual bool AssociateModels(SyncError* error);
 
-  virtual bool DisassociateModels();
+  virtual bool DisassociateModels(SyncError* error);
 
   // The has_nodes out param is true if the sync model has nodes other
   // than the permanent tagged nodes.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
 
   // Returns sync id for the given bookmark node id.
   // Returns sync_api::kInvalidId if the sync node is not found for the given
   // bookmark node id.
   virtual int64 GetSyncIdFromChromeId(const int64& node_id);
 
@@ skipping 36 matching lines @@
   // Persists all dirty associations.
   void PersistAssociations();
 
   // Loads the persisted associations into in-memory maps.
   // If the persisted associations are out-of-date due to some reason, returns
   // false; otherwise returns true.
   bool LoadAssociations();
 
   // Matches up the bookmark model and the sync model to build model
   // associations.
-  bool BuildAssociations();
+  bool BuildAssociations(SyncError* error);
 
   // 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.
   bool AssociateTaggedPermanentNode(const BookmarkNode* permanent_node,
                                     const std::string& tag);
 
   // Compare the properties of a pair of nodes from either domain.
@@ skipping 14 matching lines @@
   ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_;
 
   int number_of_new_sync_nodes_created_at_association_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_