| Index: chrome/browser/bookmarks/bookmark_storage.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
|
| index 58881cf81ee9b155e887680330498aaf7c1ead96..e3daffd0edb3af3be5a557742329ba2a31cf0547 100644
|
| --- a/chrome/browser/bookmarks/bookmark_storage.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_storage.cc
|
| @@ -62,7 +62,7 @@ void LoadCallback(const FilePath& path,
|
| BookmarkCodec codec;
|
| TimeTicks start_time = TimeTicks::Now();
|
| codec.Decode(details->bb_node(), details->other_folder_node(),
|
| - details->synced_folder_node(), &max_node_id, *root.get());
|
| + details->mobile_folder_node(), &max_node_id, *root.get());
|
| details->set_max_id(std::max(max_node_id, details->max_id()));
|
| details->set_computed_checksum(codec.computed_checksum());
|
| details->set_stored_checksum(codec.stored_checksum());
|
| @@ -73,7 +73,7 @@ void LoadCallback(const FilePath& path,
|
| start_time = TimeTicks::Now();
|
| AddBookmarksToIndex(details, details->bb_node());
|
| AddBookmarksToIndex(details, details->other_folder_node());
|
| - AddBookmarksToIndex(details, details->synced_folder_node());
|
| + AddBookmarksToIndex(details, details->mobile_folder_node());
|
| UMA_HISTOGRAM_TIMES("Bookmarks.CreateBookmarkIndexTime",
|
| TimeTicks::Now() - start_time);
|
| }
|
| @@ -91,12 +91,12 @@ void LoadCallback(const FilePath& path,
|
|
|
| BookmarkLoadDetails::BookmarkLoadDetails(BookmarkNode* bb_node,
|
| BookmarkNode* other_folder_node,
|
| - BookmarkNode* synced_folder_node,
|
| + BookmarkNode* mobile_folder_node,
|
| BookmarkIndex* index,
|
| int64 max_id)
|
| : bb_node_(bb_node),
|
| other_folder_node_(other_folder_node),
|
| - synced_folder_node_(synced_folder_node),
|
| + mobile_folder_node_(mobile_folder_node),
|
| index_(index),
|
| max_id_(max_id),
|
| ids_reassigned_(false) {
|
|
|