Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_model_unittest.cc

Index: components/bookmarks/browser/bookmark_model_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index bf4f9176d0cf05e42ceb73f730e10d40e8b5141b..baf934f5206c98544d9a3006a09e12dab7020f98 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -242,7 +242,7 @@ class BookmarkModelTest : public testing::Test,
     int index2_;
   };
 
-  BookmarkModelTest() : model_(client_.CreateModel()) {
+  BookmarkModelTest() : model_(TestBookmarkClient::CreateModel()) {
     model_->AddObserver(this);
     ClearCounts();
   }
@@ -371,10 +371,10 @@ class BookmarkModelTest : public testing::Test,
     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();
 
@@ -385,7 +385,6 @@ class BookmarkModelTest : public testing::Test,
   }
 
  protected:
-  TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
   ObserverDetails observer_details_;
 
@@ -1157,10 +1156,9 @@ TEST(BookmarkModelTest2, CreateAndRestore) {
     { "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);