| Index: components/bookmarks/test/test_bookmark_client.cc
|
| diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
|
| index ad6b6b652d1ec8f562aa34d15083033d17306183..324c602c6b88d69ad91689e14ebc16f4a4f90fc1 100644
|
| --- a/components/bookmarks/test/test_bookmark_client.cc
|
| +++ b/components/bookmarks/test/test_bookmark_client.cc
|
| @@ -19,7 +19,10 @@ TestBookmarkClient::~TestBookmarkClient() {}
|
|
|
| scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel(bool index_urls) {
|
| scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(this, index_urls));
|
| - bookmark_model->DoneLoading(bookmark_model->CreateLoadDetails(std::string()));
|
| + scoped_ptr<bookmarks::BookmarkLoadDetails> details =
|
| + bookmark_model->CreateLoadDetails(std::string());
|
| + details->LoadExtraNodes();
|
| + bookmark_model->DoneLoading(details.Pass());
|
| return bookmark_model.Pass();
|
| }
|
|
|
| @@ -83,6 +86,10 @@ bool TestBookmarkClient::CanReorderChildren(const BookmarkNode* parent) {
|
| return !IsAnExtraNode(parent);
|
| }
|
|
|
| +bool TestBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) {
|
| + return !IsAnExtraNode(node);
|
| +}
|
| +
|
| // static
|
| bookmarks::BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes(
|
| bookmarks::BookmarkPermanentNodeList extra_nodes,
|
|
|