Change ownership of BookmarkClient

components/bookmarks/test/test_bookmark_client.cc

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 b31edcf82f7030bb4f53d100b05dce271ea47270..cb374e7f1f5ab72a19a0f02d7eb0c27bc66d12c6 100644
--- a/components/bookmarks/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -13,24 +13,34 @@
 
 namespace bookmarks {
 
-TestBookmarkClient::TestBookmarkClient() {}
-
-TestBookmarkClient::~TestBookmarkClient() {}
-
-scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
-  scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(this));
-  scoped_ptr<BookmarkLoadDetails> details =
-      bookmark_model->CreateLoadDetails(std::string());
-  details->LoadExtraNodes();
-  bookmark_model->DoneLoading(details.Pass());
+// static
+scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel(
+    BookmarkPermanentNodeList extra_nodes,
+    TestBookmarkClient** client,
+    bool no_load) {
+  DCHECK(!client || !*client);
+  TestBookmarkClient* bookmark_client = new TestBookmarkClient;
+  bookmark_client->SetExtraNodesToLoad(extra_nodes.Pass());
+  scoped_ptr<BookmarkModel> bookmark_model(
+      new BookmarkModel(scoped_ptr<BookmarkClient>(bookmark_client)));
+  if (!no_load) {
+    scoped_ptr<BookmarkLoadDetails> details =
+        bookmark_model->CreateLoadDetails(std::string());
+    details->LoadExtraNodes();
+    bookmark_model->DoneLoading(details.Pass());
+  }
+  if (client)
+    *client = bookmark_client;
   return bookmark_model.Pass();
 }
 
-void TestBookmarkClient::SetExtraNodesToLoad(
-    BookmarkPermanentNodeList extra_nodes) {
-  extra_nodes_to_load_ = extra_nodes.Pass();
-  // Keep a copy in |extra_nodes_| for the accessor.
-  extra_nodes_ = extra_nodes_to_load_.get();
+scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel(
+    TestBookmarkClient** client) {
+  return CreateModel(BookmarkPermanentNodeList(), client, false);
+}
+
+scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() {
+  return CreateModel(BookmarkPermanentNodeList(), nullptr, false);
 }
 
 bool TestBookmarkClient::IsExtraNodeRoot(const BookmarkNode* node) {
@@ -51,6 +61,41 @@ bool TestBookmarkClient::IsAnExtraNode(const BookmarkNode* node) {
   return false;
 }
 
+TestBookmarkClient::TestBookmarkClient() {
+}
+
+TestBookmarkClient::~TestBookmarkClient() {
+}
+
+void TestBookmarkClient::SetExtraNodesToLoad(
+    BookmarkPermanentNodeList extra_nodes) {
+  extra_nodes_to_load_ = extra_nodes.Pass();
+  // Keep a copy in |extra_nodes_| for the accessor.
+  extra_nodes_ = extra_nodes_to_load_.get();
+}
+
+void TestBookmarkClient::Init(BookmarkModel* bookmark_model) {
+}
+
+base::CancelableTaskTracker::TaskId
+TestBookmarkClient::GetFaviconImageForPageURL(
+    const GURL& page_url,
+    favicon_base::IconType type,
+    const favicon_base::FaviconImageCallback& callback,
+    base::CancelableTaskTracker* tracker) {
+  return base::CancelableTaskTracker::kBadTaskId;
+}
+
+bool TestBookmarkClient::SupportsTypedCountForNodes() {
+  return false;
+}
+
+void TestBookmarkClient::GetTypedCountForNodes(
+    const NodeSet& nodes,
+    NodeTypedCountPairs* node_typed_count_pairs) {
+  NOTREACHED();
+}
+
 void TestBookmarkClient::RecordAction(const base::UserMetricsAction& action) {
 }