Introduce BookmarkClient interface to abstract embedder

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 "chrome/browser/autocomplete/bookmark_provider.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/test_bookmark_client.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/core/browser/bookmark_match.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The bookmark corpus against which we will simulate searches.
 struct BookmarksTestInfo {
   std::string title;
   std::string url;
 } bookmark_provider_test_data[] = {
   { "abc def", "http://www.catsanddogs.com/a" },
@@ skipping 34 matching lines @@
                              public AutocompleteProviderListener {
  public:
   BookmarkProviderTest();
 
   // AutocompleteProviderListener: Not called.
   virtual void OnProviderUpdate(bool updated_matches) OVERRIDE {}
 
  protected:
   virtual void SetUp() OVERRIDE;
 
+  test::TestBookmarkClient client_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<BookmarkModel> model_;
   scoped_refptr<BookmarkProvider> provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkProviderTest);
 };
 
 BookmarkProviderTest::BookmarkProviderTest() {
-  model_.reset(new BookmarkModel(NULL, false));
+  model_ = client_.CreateModel(false);
 }
 
 void BookmarkProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   DCHECK(profile_.get());
   provider_ = new BookmarkProvider(this, profile_.get());
   DCHECK(provider_.get());
   provider_->set_bookmark_model_for_testing(model_.get());
 
   const BookmarkNode* other_node = model_->other_node();
@@ skipping 328 matching lines @@
     { "blah",      "blah.com",                   "0:3,4:1"               },
     { "http blah", "http://blah.com",            "0:3,4:1,7:3,11:1"      },
     { "dom",       "www.domain.com/http/",       "0:1,4:3,7:1"           },
     { "dom http",  "http://www.domain.com/http/",
       "0:3,4:1,11:3,14:1,22:3,26:1"                                      },
     { "rep",       "www.repeat.com/1/repeat/2/", "0:1,4:3,7:1,17:3,20:1" },
     { "versi",     "chrome://version",           "0:1,9:3,14:1"          }
   };
 
   // Reload the bookmarks index with |index_urls| == true.
-  model_.reset(new BookmarkModel(NULL, true));
+  model_ = client_.CreateModel(true);
   SetUp();
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     std::string description = "for query=" + query_data[i].query;
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
                             AutocompleteInput::INVALID_SPEC, false, false,
                             false, true);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
@@ skipping 12 matching lines @@
       ASSERT_EQ(2U, chunks.size()) << description;
       size_t offset;
       EXPECT_TRUE(base::StringToSizeT(chunks[0], &offset)) << description;
       EXPECT_EQ(offset, match.contents_class[i].offset) << description;
       int style;
       EXPECT_TRUE(base::StringToInt(chunks[1], &style)) << description;
       EXPECT_EQ(style, match.contents_class[i].style) << description;
     }
   }
 }