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/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/bookmark_test_helpers.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/core/browser/bookmark_title_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 24 matching lines @@
   {"burning worms #1", "http://www.burned.com/" },
   {"burning worms #2", "http://www.worms.com/" },
   {"worming burns #10", "http://www.burned.com/" },
   {"worming burns #20", "http://www.worms.com/" },
   {"jive music", "http://www.worms.com/" },
 };
 
 class BookmarkProviderTest : public testing::Test,
                              public AutocompleteProviderListener {
  public:
-  BookmarkProviderTest() : model_(new BookmarkModel(NULL)) {}
+  BookmarkProviderTest() : model_(client_.CreateModel()) {}
 
   // 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);
 };
 
 void BookmarkProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
@@ skipping 308 matching lines @@
     BookmarkTitleMatch bookmark_match;
     bookmark_match.node = &node;
     const AutocompleteMatch& ac_match =
         provider_->TitleMatchToACMatch(input, fixed_up_input, bookmark_match);
     EXPECT_EQ(query_data[i].allowed_to_be_default_match,
               ac_match.allowed_to_be_default_match) << description;
     EXPECT_EQ(base::ASCIIToUTF16(query_data[i].inline_autocompletion),
               ac_match.inline_autocompletion) << description;
   }
 }