Change ownership of BookmarkClient

components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc

Index: components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
index 15e9dfed511433e561ae87287821e89b0dbfb841..413f5fa114efdaf4549be3865bebaf8a7f8d3eaa 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
@@ -49,8 +49,7 @@ class EnhancedBookmarkModelTest
 
   void SetUp() override {
     message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
-    bookmark_client_.reset(new bookmarks::TestBookmarkClient());
-    bookmark_model_.reset(bookmark_client_->CreateModel().release());
+    bookmark_model_ = bookmarks::TestBookmarkClient::CreateModel();
     model_.reset(new EnhancedBookmarkModel(bookmark_model_.get(), "v1.0"));
     model_->AddObserver(this);
   }
@@ -60,7 +59,6 @@ class EnhancedBookmarkModelTest
       model_->Shutdown();
     model_.reset();
     bookmark_model_.reset();
-    bookmark_client_.reset();
     message_loop_.reset();
   }
 
@@ -108,7 +106,6 @@ class EnhancedBookmarkModelTest
   }
 
   scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<bookmarks::TestBookmarkClient> bookmark_client_;
   scoped_ptr<BookmarkModel> bookmark_model_;
   scoped_ptr<EnhancedBookmarkModel> model_;