Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_model_unittest.cc

 // 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.
 
 #include "components/bookmarks/browser/bookmark_model.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 224 matching lines @@
       EXPECT_EQ(index2_, index2);
     }
 
    private:
     const BookmarkNode* node1_;
     const BookmarkNode* node2_;
     int index1_;
     int index2_;
   };
 
-  BookmarkModelTest() : model_(client_.CreateModel()) {
+  BookmarkModelTest() : model_(TestBookmarkClient::CreateModel()) {
     model_->AddObserver(this);
     ClearCounts();
   }
 
   void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
 
   void BookmarkNodeMoved(BookmarkModel* model,
@@ skipping 108 matching lines @@
               extensive_changes_beginning_count_);
     EXPECT_EQ(extensive_changes_ended_count, extensive_changes_ended_count_);
   }
 
   int AllNodesRemovedObserverCount() const { return all_bookmarks_removed_; }
 
   BookmarkPermanentNode* ReloadModelWithExtraNode() {
     BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
     BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(extra_node);
-    client_.SetExtraNodesToLoad(extra_nodes.Pass());
 
     model_->RemoveObserver(this);
-    model_ = client_.CreateModel();
+    model_ =
+        TestBookmarkClient::CreateModel(extra_nodes.Pass(), nullptr, false);
     model_->AddObserver(this);
     ClearCounts();
 
     if (model_->root_node()->GetIndexOf(extra_node) == -1)
       ADD_FAILURE();
 
     return extra_node;
   }
 
  protected:
-  TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
   ObserverDetails observer_details_;
 
  private:
   int added_count_;
   int moved_count_;
   int removed_count_;
   int changed_count_;
   int reordered_count_;
   int extensive_changes_beginning_count_;
@@ skipping 751 matching lines @@
     const std::string mobile_contents;
   } data[] = {
     // See PopulateNodeFromString for a description of these strings.
     { "", "" },
     { "a", "b" },
     { "a [ b ]", "" },
     { "", "[ b ] a [ c [ d e [ f ] ] ]" },
     { "a [ b ]", "" },
     { "a b c [ d e [ f ] ]", "g h i [ j k [ l ] ]"},
   };
-  TestBookmarkClient client;
   scoped_ptr<BookmarkModel> model;
   for (size_t i = 0; i < arraysize(data); ++i) {
-    model = client.CreateModel();
+    model = TestBookmarkClient::CreateModel();
 
     TestNode bbn;
     PopulateNodeFromString(data[i].bbn_contents, &bbn);
     PopulateBookmarkNode(&bbn, model.get(), model->bookmark_bar_node());
 
     TestNode other;
     PopulateNodeFromString(data[i].other_contents, &other);
     PopulateBookmarkNode(&other, model.get(), model->other_node());
 
     TestNode mobile;
     PopulateNodeFromString(data[i].mobile_contents, &mobile);
     PopulateBookmarkNode(&mobile, model.get(), model->mobile_node());
 
     VerifyModelMatchesNode(&bbn, model->bookmark_bar_node());
     VerifyModelMatchesNode(&other, model->other_node());
     VerifyModelMatchesNode(&mobile, model->mobile_node());
     VerifyNoDuplicateIDs(model.get());
   }
 }
 
 }  // namespace
 }  // namespace bookmarks