Change ownership of BookmarkClient

components/undo/bookmark_undo_service_test.cc

 // Copyright 2013 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/undo/bookmark_undo_service.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 class BookmarkUndoServiceTest : public testing::Test {
  public:
   BookmarkUndoServiceTest();
 
   void SetUp() override;
   void TearDown() override;
 
   BookmarkModel* GetModel();
   BookmarkUndoService* GetUndoService();
 
  private:
-  scoped_ptr<bookmarks::TestBookmarkClient> test_bookmark_client_;
   scoped_ptr<bookmarks::BookmarkModel> bookmark_model_;
   scoped_ptr<BookmarkUndoService> bookmark_undo_service_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkUndoServiceTest);
 };
 
 BookmarkUndoServiceTest::BookmarkUndoServiceTest() {}
 
 void BookmarkUndoServiceTest::SetUp() {
-  DCHECK(!test_bookmark_client_);
   DCHECK(!bookmark_model_);
   DCHECK(!bookmark_undo_service_);
-  test_bookmark_client_.reset(new bookmarks::TestBookmarkClient);
-  bookmark_model_ = test_bookmark_client_->CreateModel();
+  bookmark_model_ = bookmarks::TestBookmarkClient::CreateModel();
   bookmark_undo_service_.reset(new BookmarkUndoService);
   bookmark_undo_service_->Start(bookmark_model_.get());
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_.get());
 }
 
 BookmarkModel* BookmarkUndoServiceTest::GetModel() {
   return bookmark_model_.get();
 }
 
 BookmarkUndoService* BookmarkUndoServiceTest::GetUndoService() {
   return bookmark_undo_service_.get();
 }
 
 void BookmarkUndoServiceTest::TearDown() {
   // Implement two-phase KeyedService shutdown for test KeyedServices.
   bookmark_undo_service_->Shutdown();
   bookmark_model_->Shutdown();
-  test_bookmark_client_->Shutdown();
   bookmark_undo_service_.reset();
   bookmark_model_.reset();
-  test_bookmark_client_.reset();
 }
 
 TEST_F(BookmarkUndoServiceTest, AddBookmark) {
   BookmarkModel* model = GetModel();
   BookmarkUndoService* undo_service = GetUndoService();
 
   const BookmarkNode* parent = model->other_node();
   model->AddURL(parent, 0, ASCIIToUTF16("foo"), GURL("http://www.bar.com"));
 
   // Undo bookmark creation and test for no bookmarks.
@@ skipping 336 matching lines @@
   while (undo_service->undo_manager()->undo_count())
     undo_service->undo_manager()->Undo();
 
   EXPECT_EQ(1, parent->child_count());
   const BookmarkNode* node = model->other_node()->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo"));
   EXPECT_EQ(node->url(), GURL("http://www.foo.com"));
 }
 
 } // namespace