[Sync] Fix mobile bookmark folder association on non-android

chrome/browser/sync/glue/bookmark_model_associator.cc

Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 2b0703359c636665715d9957f2de4a610067a4fd..0107b0adfa445e81428f93c66c729bc8ebef9856 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -397,23 +397,20 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociations() {
   // and Other Bookmarks.
   error = AssociateTaggedPermanentNode(bookmark_model_->other_node(),
                                        kOtherBookmarksTag);
-  if (error.IsSet()) {
+  if (error.IsSet())
     return error;
-  }
 
   error = AssociateTaggedPermanentNode(bookmark_model_->bookmark_bar_node(),
                                        kBookmarkBarTag);
-  if (error.IsSet()) {
+  if (error.IsSet())
     return error;
-  }
 
-  if (expect_mobile_bookmarks_folder_) {
-    error = AssociateTaggedPermanentNode(bookmark_model_->mobile_node(),
-                                         kMobileBookmarksTag);
-    if (error.IsSet()) {
-      return error;
-    }
-  }
+  error = AssociateTaggedPermanentNode(bookmark_model_->mobile_node(),
+                                       kMobileBookmarksTag);
+  if (error.IsSet() && expect_mobile_bookmarks_folder_)
+    return error;
+  else

[tim (not reviewing), 2012/08/10 23:31:22]

The 'else' isn't really necessary here.  Lets just reset 'error'.

+    error = syncer::SyncError();
 
   int64 bookmark_bar_sync_id = GetSyncIdFromChromeId(
       bookmark_model_->bookmark_bar_node()->id());