Change ownership of BookmarkClient

components/bookmarks/test/test_bookmark_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
 #define COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 
 namespace bookmarks {
 
 class BookmarkModel;
 
 class TestBookmarkClient : public BookmarkClient {
  public:
-  TestBookmarkClient();
-  ~TestBookmarkClient() override;
+  // 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);
 
-  // Create a BookmarkModel using this object as its client. The returned
-  // BookmarkModel* is owned by the caller.
-  scoped_ptr<BookmarkModel> CreateModel();
-
-  // 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() {
     return extra_nodes_;
   }
 
   // Returns true if |node| is one of the |extra_nodes_|.
   bool IsExtraNodeRoot(const BookmarkNode* node);
 
   // Returns true if |node| belongs to the tree of one of the |extra_nodes_|.
   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,
       scoped_ptr<BookmarkPermanentNode> supervised_node,
       const ExtraNodeLoadedCallback& callback) override;
   void DoneLoading(BookmarkPermanentNode* managed_node,
                    BookmarkPermanentNode* supervised_node) override;
 
   // Helpers for GetLoadExtraNodesCallback().
   static BookmarkPermanentNodeList LoadExtraNodes(
       BookmarkPermanentNodeList extra_nodes,
       int64* next_id);
 
   BookmarkPermanentNodeList extra_nodes_to_load_;
   std::vector<BookmarkPermanentNode*> extra_nodes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBookmarkClient);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_