Change ownership of BookmarkClient

chrome/browser/autocomplete/bookmark_provider_unittest.cc

 // Copyright (c) 2012 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/omnibox/bookmark_provider.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 59 matching lines @@
 };
 
 class BookmarkProviderTest : public testing::Test {
  public:
   BookmarkProviderTest();
 
  protected:
   void SetUp() override;
 
   content::TestBrowserThreadBundle thread_bundle_;
-  bookmarks::TestBookmarkClient bookmark_client_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<ChromeAutocompleteProviderClient> provider_client_;
   scoped_ptr<BookmarkModel> model_;
   scoped_refptr<BookmarkProvider> provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkProviderTest);
 };
 
 BookmarkProviderTest::BookmarkProviderTest() {
-  model_ = bookmark_client_.CreateModel();
+  model_ = bookmarks::TestBookmarkClient::CreateModel();
 }
 
 void BookmarkProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   DCHECK(profile_.get());
   provider_client_.reset(new ChromeAutocompleteProviderClient(profile_.get()));
   provider_ = new BookmarkProvider(provider_client_.get());
   DCHECK(provider_.get());
   provider_->set_bookmark_model_for_testing(model_.get());
 
@@ skipping 379 matching lines @@
 }
 
 TEST_F(BookmarkProviderTest, DoesNotProvideMatchesOnFocus) {
   AutocompleteInput input(
       base::ASCIIToUTF16("foo"), base::string16::npos, std::string(), GURL(),
       metrics::OmniboxEventProto::INVALID_SPEC, false, false, false, true, true,
       ChromeAutocompleteSchemeClassifier(profile_.get()));
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->matches().empty());
 }