Change ownership of BookmarkClient

components/bookmarks/test/test_bookmark_client.h

Index: components/bookmarks/test/test_bookmark_client.h
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index 11a1a2cee5e997985e7dadcad3e80a39cf715477..6618ab445506efacc240113be79b2e90999aa0b5 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -14,16 +14,16 @@ class BookmarkModel;
 
 class TestBookmarkClient : public BookmarkClient {
  public:
-  TestBookmarkClient();
-  ~TestBookmarkClient() override;
-
-  // Create a BookmarkModel using this object as its client. The returned
-  // BookmarkModel* is owned by the caller.
-  scoped_ptr<BookmarkModel> CreateModel();
+  // Creates a BookmarkModel with a TestBookmarkClient initialized with
+  // |extra_nodes| and return the TestBookmarkClient via |client| if non-null.
+  static scoped_ptr<BookmarkModel> CreateModel(
+      BookmarkPermanentNodeList extra_nodes,
+      TestBookmarkClient** client,
+      bool no_load);
 
-  // Sets the list of extra nodes to be returned by the next call to
-  // CreateModel() or GetLoadExtraNodesCallback().
-  void SetExtraNodesToLoad(BookmarkPermanentNodeList extra_nodes);
+  // Helper for CreateModel passing an empty BookmarkPermanentNodeList.
+  static scoped_ptr<BookmarkModel> CreateModel(TestBookmarkClient** client);
+  static scoped_ptr<BookmarkModel> CreateModel();
 
   // Returns the current extra_nodes, set via SetExtraNodesToLoad().
   const std::vector<BookmarkPermanentNode*>& extra_nodes() {
@@ -37,7 +37,24 @@ class TestBookmarkClient : public BookmarkClient {
   bool IsAnExtraNode(const BookmarkNode* node);
 
  private:
+  TestBookmarkClient();
+  ~TestBookmarkClient() override;
+
+  // Sets the list of extra nodes to be returned by the next call to
+  // CreateModel() or GetLoadExtraNodesCallback().
+  void SetExtraNodesToLoad(BookmarkPermanentNodeList extra_nodes);
+
   // BookmarkClient:
+  void Init(BookmarkModel* bookmark_model) override;
+  base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
+      const GURL& page_url,
+      favicon_base::IconType type,
+      const favicon_base::FaviconImageCallback& callback,
+      base::CancelableTaskTracker* tracker) override;
+  bool SupportsTypedCountForNodes() override;
+  void GetTypedCountForNodes(
+      const NodeSet& nodes,
+      NodeTypedCountPairs* node_typed_count_pairs) override;
   void RecordAction(const base::UserMetricsAction& action) override;
   LoadExtraCallback GetLoadExtraNodesCallback(
       scoped_ptr<BookmarkPermanentNode> managed_node,