Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_codec_unittest.cc

Index: components/bookmarks/browser/bookmark_codec_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc
index 8c45aea87f0ff9cc785df6e12205c83c5ce88434..15b31028cfcb8af6222ee19d568a578272402bff 100644
--- a/components/bookmarks/browser/bookmark_codec_unittest.cc
+++ b/components/bookmarks/browser/bookmark_codec_unittest.cc
@@ -85,20 +85,20 @@ class BookmarkCodecTest : public testing::Test {
  protected:
   // Helpers to create bookmark models with different data.
   BookmarkModel* CreateTestModel1() {
-    scoped_ptr<BookmarkModel> model(client_.CreateModel());
+    scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
     const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     return model.release();
   }
   BookmarkModel* CreateTestModel2() {
-    scoped_ptr<BookmarkModel> model(client_.CreateModel());
+    scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
     const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     model->AddURL(bookmark_bar, 1, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url));
     return model.release();
   }
   BookmarkModel* CreateTestModel3() {
-    scoped_ptr<BookmarkModel> model(client_.CreateModel());
+    scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
     const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     const BookmarkNode* folder1 =
@@ -186,7 +186,7 @@ class BookmarkCodecTest : public testing::Test {
     EXPECT_EQ("", decoder.computed_checksum());
     EXPECT_EQ("", decoder.stored_checksum());
 
-    scoped_ptr<BookmarkModel> model(client_.CreateModel());
+    scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
     EXPECT_TRUE(Decode(&decoder, model.get(), value));
 
     *computed_checksum = decoder.computed_checksum();
@@ -224,8 +224,6 @@ class BookmarkCodecTest : public testing::Test {
     CheckIDs(model->other_node(), &assigned_ids);
     CheckIDs(model->mobile_node(), &assigned_ids);
   }
-
-  TestBookmarkClient client_;
 };
 
 TEST_F(BookmarkCodecTest, ChecksumEncodeDecodeTest) {
@@ -326,7 +324,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
   BookmarkCodec encoder;
   scoped_ptr<base::Value> model_value(encoder.Encode(model_to_encode.get()));
 
-  scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel());
+  scoped_ptr<BookmarkModel> decoded_model(TestBookmarkClient::CreateModel());
   BookmarkCodec decoder;
   ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *model_value.get()));
   ASSERT_NO_FATAL_FAILURE(
@@ -347,7 +345,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
   BookmarkCodec encoder2;
   scoped_ptr<base::Value> model_value2(encoder2.Encode(decoded_model.get()));
 
-  scoped_ptr<BookmarkModel> decoded_model2(client_.CreateModel());
+  scoped_ptr<BookmarkModel> decoded_model2(TestBookmarkClient::CreateModel());
   BookmarkCodec decoder2;
   ASSERT_TRUE(Decode(&decoder2, decoded_model2.get(), *model_value2.get()));
   ASSERT_NO_FATAL_FAILURE(
@@ -362,7 +360,7 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
   JSONFileValueDeserializer deserializer(test_file);
   scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
 
-  scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel());
+  scoped_ptr<BookmarkModel> decoded_model(TestBookmarkClient::CreateModel());
   BookmarkCodec decoder;
   ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *root.get()));
   ExpectIDsUnique(decoded_model.get());
@@ -448,7 +446,7 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) {
   JSONFileValueDeserializer deserializer(test_file);
   scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
 
-  scoped_ptr<BookmarkModel> model(client_.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   BookmarkCodec decoder;
   ASSERT_TRUE(Decode(&decoder, model.get(), *root.get()));