| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/bookmarks/test/test_bookmark_client.h" | 5 #include "components/bookmarks/test/test_bookmark_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 // static | 23 // static |
| 24 scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() { | 24 scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() { |
| 25 return CreateModelWithClient(make_scoped_ptr(new TestBookmarkClient)); | 25 return CreateModelWithClient(make_scoped_ptr(new TestBookmarkClient)); |
| 26 } | 26 } |
| 27 | 27 |
| 28 // static | 28 // static |
| 29 scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModelWithClient( | 29 scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModelWithClient( |
| 30 scoped_ptr<BookmarkClient> client) { | 30 scoped_ptr<BookmarkClient> client) { |
| 31 scoped_ptr<BookmarkModel> bookmark_model( | 31 scoped_ptr<BookmarkModel> bookmark_model( |
| 32 new BookmarkModel(std::move(client))); | 32 new BookmarkModel(std::move(client))); |
| 33 scoped_ptr<BookmarkLoadDetails> details = | 33 scoped_ptr<BookmarkLoadDetails> details = bookmark_model->CreateLoadDetails(); |
| 34 bookmark_model->CreateLoadDetails(std::string()); | |
| 35 details->LoadExtraNodes(); | 34 details->LoadExtraNodes(); |
| 36 bookmark_model->DoneLoading(std::move(details)); | 35 bookmark_model->DoneLoading(std::move(details)); |
| 37 return bookmark_model; | 36 return bookmark_model; |
| 38 } | 37 } |
| 39 | 38 |
| 40 void TestBookmarkClient::SetExtraNodesToLoad( | 39 void TestBookmarkClient::SetExtraNodesToLoad( |
| 41 BookmarkPermanentNodeList extra_nodes) { | 40 BookmarkPermanentNodeList extra_nodes) { |
| 42 extra_nodes_to_load_ = std::move(extra_nodes); | 41 extra_nodes_to_load_ = std::move(extra_nodes); |
| 43 // Keep a copy in |extra_nodes_| for the acessor. | 42 // Keep a copy in |extra_nodes_| for the acessor. |
| 44 extra_nodes_ = extra_nodes_to_load_.get(); | 43 extra_nodes_ = extra_nodes_to_load_.get(); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 } | 92 } |
| 94 | 93 |
| 95 // static | 94 // static |
| 96 BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes( | 95 BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes( |
| 97 BookmarkPermanentNodeList extra_nodes, | 96 BookmarkPermanentNodeList extra_nodes, |
| 98 int64_t* next_id) { | 97 int64_t* next_id) { |
| 99 return extra_nodes; | 98 return extra_nodes; |
| 100 } | 99 } |
| 101 | 100 |
| 102 } // namespace bookmarks | 101 } // namespace bookmarks |
| OLD | NEW |