Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / autocomplete / bookmark_provider_unittest.cc

diff --git a/src/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/src/chrome/browser/autocomplete/bookmark_provider_unittest.cc
index b3c625d..ed6a160 100644 (file)
--- a/src/chrome/browser/autocomplete/bookmark_provider_unittest.cc
+++ b/src/chrome/browser/autocomplete/bookmark_provider_unittest.cc
@@ -14,13 +14,13 @@
 #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/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/omnibox/autocomplete_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using bookmarks::BookmarkMatch;
@@ -64,14 +64,10 @@ struct BookmarksTestInfo {
   {"jive music", "http://www.worms.com/" },
 };
 
-class BookmarkProviderTest : public testing::Test,
-                             public AutocompleteProviderListener {
+class BookmarkProviderTest : public testing::Test {
  public:
   BookmarkProviderTest();
 
-  // AutocompleteProviderListener: Not called.
-  virtual void OnProviderUpdate(bool updated_matches) OVERRIDE {}
-
  protected:
   virtual void SetUp() OVERRIDE;
 
@@ -91,7 +87,7 @@ BookmarkProviderTest::BookmarkProviderTest() {
 void BookmarkProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   DCHECK(profile_.get());
-  provider_ = new BookmarkProvider(this, profile_.get());
+  provider_ = new BookmarkProvider(profile_.get());
   DCHECK(provider_.get());
   provider_->set_bookmark_model_for_testing(model_.get());
 
@@ -263,7 +259,8 @@ TEST_F(BookmarkProviderTest, Positions) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, false,
-                            false, false, true);
+                            false, false, true,
+                            ChromeAutocompleteSchemeClassifier(profile_.get()));
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number of results is as expected.
@@ -340,7 +337,8 @@ TEST_F(BookmarkProviderTest, Rankings) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, false,
-                            false, false, true);
+                            false, false, true,
+                            ChromeAutocompleteSchemeClassifier(profile_.get()));
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number and content of results is as expected.
@@ -396,7 +394,8 @@ TEST_F(BookmarkProviderTest, InlineAutocompletion) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, false,
-                            false, false, true);
+                            false, false, true,
+                            ChromeAutocompleteSchemeClassifier(profile_.get()));
     const base::string16 fixed_up_input(
         provider_->FixupUserInput(input).second);
     BookmarkNode node(GURL(query_data[i].url));
@@ -442,7 +441,8 @@ TEST_F(BookmarkProviderTest, StripHttpAndAdjustOffsets) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, false,
-                            false, false, true);
+                            false, false, true,
+                            ChromeAutocompleteSchemeClassifier(profile_.get()));
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     ASSERT_EQ(1U, matches.size()) << description;