| Index: chrome/browser/sync/glue/bookmark_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
|
| index f3b75bb72989588e18446adcb761b9f1dba89ec3..d2828c7af313db064b53a4e389cca3a7352a4e4e 100644
|
| --- a/chrome/browser/sync/glue/bookmark_model_associator.h
|
| +++ b/chrome/browser/sync/glue/bookmark_model_associator.h
|
| @@ -58,9 +58,9 @@ class BookmarkModelAssociator
|
| // 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(SyncError* error) OVERRIDE;
|
| + virtual SyncError AssociateModels() OVERRIDE;
|
|
|
| - virtual bool DisassociateModels(SyncError* error) OVERRIDE;
|
| + virtual SyncError DisassociateModels() OVERRIDE;
|
|
|
| // The has_nodes out param is true if the sync model has nodes other
|
| // than the permanent tagged nodes.
|
| @@ -117,15 +117,16 @@ class BookmarkModelAssociator
|
|
|
| // Matches up the bookmark model and the sync model to build model
|
| // associations.
|
| - bool BuildAssociations(SyncError* error);
|
| + SyncError BuildAssociations();
|
|
|
| // 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) WARN_UNUSED_RESULT;
|
| + SyncError AssociateTaggedPermanentNode(
|
| + const BookmarkNode* permanent_node,
|
| + const std::string& tag) WARN_UNUSED_RESULT;
|
|
|
| // Compare the properties of a pair of nodes from either domain.
|
| bool NodesMatch(const BookmarkNode* bookmark,
|
|
|