| 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 b8b38e98313528d1c62984219c91b3c19223b5e5..b31edcf82f7030bb4f53d100b05dce271ea47270 100644
|
| --- a/components/bookmarks/test/test_bookmark_client.cc
|
| +++ b/components/bookmarks/test/test_bookmark_client.cc
|
| @@ -29,7 +29,7 @@ scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
|
| void TestBookmarkClient::SetExtraNodesToLoad(
|
| BookmarkPermanentNodeList extra_nodes) {
|
| extra_nodes_to_load_ = extra_nodes.Pass();
|
| - // Keep a copy in |extra_nodes_| for the acessor.
|
| + // Keep a copy in |extra_nodes_| for the accessor.
|
| extra_nodes_ = extra_nodes_to_load_.get();
|
| }
|
|
|
| @@ -51,34 +51,19 @@ bool TestBookmarkClient::IsAnExtraNode(const BookmarkNode* node) {
|
| return false;
|
| }
|
|
|
| -bool TestBookmarkClient::IsPermanentNodeVisible(
|
| - const BookmarkPermanentNode* node) {
|
| - DCHECK(node->type() == BookmarkNode::BOOKMARK_BAR ||
|
| - node->type() == BookmarkNode::OTHER_NODE ||
|
| - node->type() == BookmarkNode::MOBILE ||
|
| - IsExtraNodeRoot(node));
|
| - return node->type() != BookmarkNode::MOBILE && !IsExtraNodeRoot(node);
|
| -}
|
| -
|
| void TestBookmarkClient::RecordAction(const base::UserMetricsAction& action) {
|
| }
|
|
|
| -LoadExtraCallback TestBookmarkClient::GetLoadExtraNodesCallback() {
|
| +LoadExtraCallback TestBookmarkClient::GetLoadExtraNodesCallback(
|
| + scoped_ptr<BookmarkPermanentNode> managed_node,
|
| + scoped_ptr<BookmarkPermanentNode> supervised_node,
|
| + const ExtraNodeLoadedCallback& callback) {
|
| return base::Bind(&TestBookmarkClient::LoadExtraNodes,
|
| base::Passed(&extra_nodes_to_load_));
|
| }
|
|
|
| -bool TestBookmarkClient::CanSetPermanentNodeTitle(
|
| - const BookmarkNode* permanent_node) {
|
| - return IsExtraNodeRoot(permanent_node);
|
| -}
|
| -
|
| -bool TestBookmarkClient::CanSyncNode(const BookmarkNode* node) {
|
| - return !IsAnExtraNode(node);
|
| -}
|
| -
|
| -bool TestBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) {
|
| - return !IsAnExtraNode(node);
|
| +void TestBookmarkClient::DoneLoading(BookmarkPermanentNode* managed_node,
|
| + BookmarkPermanentNode* supervised_node) {
|
| }
|
|
|
| // static
|
|
|