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

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 448 matching lines @@
         if (BookmarkChangeProcessor::SetBookmarkFavicon(
             &sync_child_node, child_node, bookmark_model_)) {
           BookmarkChangeProcessor::SetSyncNodeFavicon(
               child_node, bookmark_model_, &sync_child_node);
         }
       } else {
         // Create a new bookmark node for the sync node.
         child_node = BookmarkChangeProcessor::CreateBookmarkNode(
             &sync_child_node, parent_node, bookmark_model_, index);
         if (!child_node) {
-          error->Reset(FROM_HERE,
-                       "Failed to create bookmark node with title " +
-                        sync_child_node.GetTitle() + " and url " +
-                        sync_child_node.GetURL().possibly_invalid_spec(),
-                       model_type());
-          return false;
+          // This can happen if a sync bookmark node doesn't have a valid url.
+          // As far as we can tell, it appears this can only happen if something
+          // interrupts association. For now, we just ignore the bookmark.
+          LOG(ERROR) << "Failed to create bookmark node with title "
+                     << sync_child_node.GetTitle() << " and url "
+                     << sync_child_node.GetURL().possibly_invalid_spec();
         }
       }
-      Associate(child_node, sync_child_id);
+      if (child_node) {
+        Associate(child_node, sync_child_id);
+      }
       if (sync_child_node.GetIsFolder())
         dfs_stack.push(sync_child_id);
 
       sync_child_id = sync_child_node.GetSuccessorId();
       ++index;
     }
 
     // At this point all the children nodes of the parent sync node have
     // corresponding children in the parent bookmark node and they are all in
     // the right positions: from 0 to index - 1.
@@ skipping 154 matching lines @@
 bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   sync_api::ReadTransaction trans(FROM_HERE, user_share_);
   const syncable::ModelTypeSet encrypted_types =
       sync_api::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(syncable::BOOKMARKS) ||
       trans.GetCryptographer()->is_ready();
 }
 
 }  // namespace browser_sync