| 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 806acb5016110b4d4860a3b86c7b4b6957b502d3..bac5dad899d2a1399628f5bb8660c9ff0401d432 100644
|
| --- a/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| @@ -125,7 +125,7 @@ BookmarkNodeFinder::BookmarkNodeFinder(const BookmarkNode* parent_node)
|
| const BookmarkNode* BookmarkNodeFinder::FindBookmarkNode(
|
| const syncer::BaseNode& sync_node) {
|
| // Create a bookmark node from the given sync node.
|
| - BookmarkNode temp_node(sync_node.GetURL());
|
| + BookmarkNode temp_node(GURL(sync_node.GetBookmarkSpecifics().url()));
|
| temp_node.SetTitle(UTF8ToUTF16(sync_node.GetTitle()));
|
| if (sync_node.GetIsFolder())
|
| temp_node.set_type(BookmarkNode::FOLDER);
|
| @@ -324,7 +324,7 @@ bool BookmarkModelAssociator::NodesMatch(
|
| if (bookmark->is_folder() != sync_node->GetIsFolder())
|
| return false;
|
| if (bookmark->is_url()) {
|
| - if (bookmark->url() != sync_node->GetURL())
|
| + if (bookmark->url() != GURL(sync_node->GetBookmarkSpecifics().url()))
|
| return false;
|
| }
|
| // Don't compare favicons here, because they are not really
|
|
|