Change ownership of BookmarkClient

components/bookmarks/managed/managed_bookmarks_tracker_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/managed/managed_bookmarks_tracker.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 41 matching lines @@
     BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100);
     ManagedBookmarksTracker::LoadInitial(
         managed_node,
         prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)),
         101);
     managed_node->set_visible(!managed_node->empty());
     managed_node->SetTitle(l10n_util::GetStringUTF16(
         is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
                       : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
 
+    bookmarks::TestBookmarkClient* client = nullptr;
     bookmarks::BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(managed_node);
-    client_.SetExtraNodesToLoad(extra_nodes.Pass());
 
-    model_.reset(new BookmarkModel(&client_));
+    model_ = TestBookmarkClient::CreateModel(extra_nodes.Pass(), &client, true);
     model_->AddObserver(&observer_);
     EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _));
     model_->Load(&prefs_, std::string(), base::FilePath(),
                  base::ThreadTaskRunnerHandle::Get(),
                  base::ThreadTaskRunnerHandle::Get());
     bookmarks::test::WaitForBookmarkModelToLoad(model_.get());
     Mock::VerifyAndClearExpectations(&observer_);
 
-    ASSERT_EQ(1u, client_.extra_nodes().size());
-    managed_node_ = client_.extra_nodes()[0];
+    ASSERT_EQ(1u, client->extra_nodes().size());
+    managed_node_ = client->extra_nodes()[0];
     ASSERT_EQ(managed_node, managed_node_);
 
     managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
         model_.get(),
         &prefs_,
         is_supervised,
         base::Bind(&ManagedBookmarksTrackerTest::GetManagementDomain)));
     managed_bookmarks_tracker_->Init(managed_node_);
   }
 
@@ skipping 72 matching lines @@
       if (!dict->GetString("url", &url) || node->url() != GURL(url))
         return false;
     } else {
       return false;
     }
     return true;
   }
 
   base::MessageLoop loop_;
   TestingPrefServiceSimple prefs_;
-  bookmarks::TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
   bookmarks::MockBookmarkModelObserver observer_;
   BookmarkPermanentNode* managed_node_;
   scoped_ptr<ManagedBookmarksTracker> managed_bookmarks_tracker_;
 };
 
 TEST_F(ManagedBookmarksTrackerTest, Empty) {
   CreateModel(false /* is_supervised */);
   EXPECT_TRUE(model_->bookmark_bar_node()->empty());
   EXPECT_TRUE(model_->other_node()->empty());
@@ skipping 154 matching lines @@
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
   model_->RemoveAllUserBookmarks();
   EXPECT_EQ(2, managed_node()->child_count());
   EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
 }  // namespace bookmarks