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

chrome/browser/sync/glue/bookmark_model_associator.cc

 // 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.
 
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 379 matching lines @@
   // This algorithm will not do well if the folder name has changes but the
   // children under them are all the same.
 
   syncer::SyncError error;
   DCHECK(bookmark_model_->IsLoaded());
 
   // To prime our association, we associate the top-level nodes, Bookmark Bar
   // 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());
   DCHECK_NE(bookmark_bar_sync_id, syncer::kInvalidId);
   int64 other_bookmarks_sync_id = GetSyncIdFromChromeId(
       bookmark_model_->other_node()->id());
   DCHECK_NE(other_bookmarks_sync_id, syncer::kInvalidId);
   int64 mobile_bookmarks_sync_id = GetSyncIdFromChromeId(
        bookmark_model_->mobile_node()->id());
   if (expect_mobile_bookmarks_folder_) {
@@ skipping 236 matching lines @@
 bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, user_share_);
   const syncer::ModelTypeSet encrypted_types =
       syncer::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(syncer::BOOKMARKS) ||
       trans.GetCryptographer()->is_ready();
 }
 
 }  // namespace browser_sync