Move KeywordProvider to components/omnibox

components/omnibox/keyword_provider_unittest.cc

Index: components/omnibox/keyword_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/components/omnibox/keyword_provider_unittest.cc
similarity index 94%
rename from chrome/browser/autocomplete/keyword_provider_unittest.cc
rename to components/omnibox/keyword_provider_unittest.cc
index 874849d1bda1c7a6eb793f947cc3e3d459e10d59..a258a52b8e7b7145a0002ac2c686fc6f1e87d822 100644
--- a/chrome/browser/autocomplete/keyword_provider_unittest.cc
+++ b/components/omnibox/keyword_provider_unittest.cc
@@ -5,10 +5,10 @@
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
-#include "chrome/browser/autocomplete/keyword_provider.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_match.h"
+#include "components/omnibox/autocomplete_scheme_classifier.h"
+#include "components/omnibox/keyword_provider.h"
 #include "components/search_engines/search_engines_switches.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
@@ -17,6 +17,20 @@
 
 using base::ASCIIToUTF16;
 
+namespace {
+
+class TestingSchemeClassifier : public AutocompleteSchemeClassifier {
+ public:
+  virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
+      const std::string& scheme) const OVERRIDE {
+    if (net::URLRequest::IsHandledProtocol(scheme))
+      return metrics::OmniboxInputType::URL;
+    return metrics::OmniboxInputType::INVALID;
+  }
+};
+
+}  // namespace
+
 class KeywordProviderTest : public testing::Test {
  protected:
   template<class ResultType>
@@ -73,18 +87,16 @@ void KeywordProviderTest::TearDown() {
 }
 
 template<class ResultType>
-void KeywordProviderTest::RunTest(
-    TestData<ResultType>* keyword_cases,
-    int num_cases,
-    ResultType AutocompleteMatch::* member) {
+void KeywordProviderTest::RunTest(TestData<ResultType>* keyword_cases,
+                                  int num_cases,
+                                  ResultType AutocompleteMatch::* member) {
   ACMatches matches;
   for (int i = 0; i < num_cases; ++i) {
     SCOPED_TRACE(keyword_cases[i].input);
     AutocompleteInput input(keyword_cases[i].input, base::string16::npos,
                             base::string16(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, true,
-                            false, true, true,
-                            ChromeAutocompleteSchemeClassifier(NULL));
+                            false, true, true, TestingSchemeClassifier());
     kw_provider_->Start(input, false);
     EXPECT_TRUE(kw_provider_->done());
     matches = kw_provider_->matches();
@@ -326,8 +338,7 @@ TEST_F(KeywordProviderTest, GetSubstitutingTemplateURLForInput) {
     AutocompleteInput input(
         ASCIIToUTF16(cases[i].text), cases[i].cursor_position, base::string16(),
         GURL(), metrics::OmniboxEventProto::INVALID_SPEC, false, false,
-        cases[i].allow_exact_keyword_match, true,
-        ChromeAutocompleteSchemeClassifier(NULL));
+        cases[i].allow_exact_keyword_match, true, TestingSchemeClassifier());
     const TemplateURL* url =
         KeywordProvider::GetSubstitutingTemplateURLForInput(model_.get(),
                                                             &input);