Change ownership of BookmarkClient

components/enhanced_bookmarks/enhanced_bookmark_model_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/enhanced_bookmarks/enhanced_bookmark_model.h"
 
 #include "base/base64.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 31 matching lines @@
         all_user_nodes_removed_calls_(0),
         remote_id_changed_calls_(0),
         last_added_(NULL),
         last_removed_(NULL),
         last_changed_(NULL),
         last_remote_id_node_(NULL) {}
   ~EnhancedBookmarkModelTest() override {}
 
   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);
   }
 
   void TearDown() override {
     if (model_)
       model_->Shutdown();
     model_.reset();
     bookmark_model_.reset();
-    bookmark_client_.reset();
     message_loop_.reset();
   }
 
  protected:
   const BookmarkNode* AddBookmark() {
     return AddBookmark("Some title", bookmark_model_->other_node());
   }
 
   const BookmarkNode* AddFolder() {
     return AddFolder("Some title", bookmark_model_->other_node());
@@ skipping 27 matching lines @@
 
   std::string GetMetaInfoField(const BookmarkNode* node,
                                const std::string& name) {
     std::string value;
     if (!node->GetMetaInfo(name, &value))
       return std::string();
     return value;
   }
 
   scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<bookmarks::TestBookmarkClient> bookmark_client_;
   scoped_ptr<BookmarkModel> bookmark_model_;
   scoped_ptr<EnhancedBookmarkModel> model_;
 
   // EnhancedBookmarkModelObserver implementation:
   void EnhancedBookmarkModelLoaded() override { loaded_calls_++; }
   void EnhancedBookmarkModelShuttingDown() override { shutting_down_calls_++; }
   void EnhancedBookmarkAdded(const BookmarkNode* node) override {
     added_calls_++;
     last_added_ = node;
   }
@@ skipping 586 matching lines @@
   EXPECT_FALSE(model_->GetOriginalImage(node, &url, &width, &height));
   EXPECT_FALSE(model_->GetThumbnailImage(node, &url, &width, &height));
 
   std::string meta_info = GetMetaInfoField(node, "stars.imageData");
   std::string decoded;
   ASSERT_TRUE(base::Base64Decode(meta_info, &decoded));
   image::collections::ImageData data;
   ASSERT_TRUE(data.ParseFromString(decoded));
   EXPECT_TRUE(data.user_removed_image());
 }