[Sync] Add support for associating a new Synced Bookmarks node.

chrome/browser/sync/glue/bookmark_change_processor.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_change_processor.h"
 
 #include <stack>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 using content::BrowserThread;
 
 namespace browser_sync {
 
+static const char kMobileBookmarksTag[] = "synced_bookmarks";
+
 BookmarkChangeProcessor::BookmarkChangeProcessor(
     BookmarkModelAssociator* model_associator,
     DataTypeErrorHandler* error_handler)
     : ChangeProcessor(error_handler),
       bookmark_model_(NULL),
       model_associator_(model_associator) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(model_associator);
   DCHECK(error_handler);
 }
@@ skipping 401 matching lines @@
       passed_deletes = true;
 
       sync_api::ReadNode src(trans);
       if (!src.InitByIdLookup(it->id)) {
         error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
             "ApplyModelChanges was passed a bad ID");
         return;
       }
 
       if (!CreateOrUpdateBookmarkNode(&src, model)) {
-        error_handler()->OnUnrecoverableError(FROM_HERE,
-            "Failed to create bookmark node with title " +
-            src.GetTitle() + " and url " +
-            src.GetURL().possibly_invalid_spec());
-        return;
+        // Because the Synced Bookmarks node can be created server side, it's
+        // possible it'll arrive at the client as an update. In that case it
+        // won't have been associated at startup, the GetChromeNodeFromSyncId
+        // call above will return NULL, and we won't detect it as a permanent
+        // node, resulting in us trying to create it here (which will
+        // fail). Therefore, we add special logic here just to detect the
+        // Synced Bookmarks folder.
+        sync_api::ReadNode synced_bookmarks(trans);
+        if (synced_bookmarks.InitByTagLookup(kMobileBookmarksTag) &&
+            synced_bookmarks.GetId() == it->id) {
+          // This is a newly created Synced Bookmarks node. Associate it.
+          model_associator_->Associate(model->mobile_node(), it->id);
+        } else {
+          // We ignore bookmarks we can't add. Chances are this is caused by
+          // a bookmark that was not fully associated.
+          LOG(ERROR) << "Failed to create bookmark node with title "
+                     << src.GetTitle() + " and url "
+                     << src.GetURL().possibly_invalid_spec();
+        }
       }
     }
   }
   // Clean up the temporary node.
   if (foster_parent) {
     // There should be no nodes left under the foster parent.
     DCHECK_EQ(foster_parent->child_count(), 0);
     model->Remove(foster_parent->parent(),
                   foster_parent->parent()->GetIndexOf(foster_parent));
     foster_parent = NULL;
@@ skipping 117 matching lines @@
     const BookmarkNode* bookmark_node,
     BookmarkModel* model,
     sync_api::WriteNode* sync_node) {
   std::vector<unsigned char> favicon_bytes;
   EncodeFavicon(bookmark_node, model, &favicon_bytes);
   if (!favicon_bytes.empty())
     sync_node->SetFaviconBytes(favicon_bytes);
 }
 
 }  // namespace browser_sync