Remove AutocompleteInput Type and PageClassification.

chrome/browser/autocomplete/history_url_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/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 171 matching lines @@
   void FillData();
 
   // Runs an autocomplete query on |text| and checks to see that the returned
   // results' destination URLs match those provided.  Also allows checking
   // that the input type was identified correctly.
   void RunTest(const base::string16 text,
                const base::string16& desired_tld,
                bool prevent_inline_autocomplete,
                const UrlAndLegalDefault* expected_urls,
                size_t num_results,
-               AutocompleteInput::Type* identified_input_type);
+               metrics::OmniboxInputType::Type* identified_input_type);
 
   // A version of the above without the final |type| output parameter.
   void RunTest(const base::string16 text,
                const base::string16& desired_tld,
                bool prevent_inline_autocomplete,
                const UrlAndLegalDefault* expected_urls,
                size_t num_results) {
-    AutocompleteInput::Type type;
+    metrics::OmniboxInputType::Type type;
     return RunTest(text, desired_tld, prevent_inline_autocomplete,
                    expected_urls, num_results, &type);
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   ACMatches matches_;
   scoped_ptr<TestingProfile> profile_;
   HistoryService* history_service_;
   scoped_refptr<HistoryURLProvider> autocomplete_;
   // Should the matches be sorted and duplicates removed?
@@ skipping 60 matching lines @@
       TimeDelta::FromDays(history::kLowQualityMatchAgeLimitInDays - 1),
       false, history::SOURCE_BROWSED);
 }
 
 void HistoryURLProviderTest::RunTest(
     const base::string16 text,
     const base::string16& desired_tld,
     bool prevent_inline_autocomplete,
     const UrlAndLegalDefault* expected_urls,
     size_t num_results,
-    AutocompleteInput::Type* identified_input_type) {
+    metrics::OmniboxInputType::Type* identified_input_type) {
   AutocompleteInput input(text, base::string16::npos, desired_tld, GURL(),
-                          AutocompleteInput::INVALID_SPEC,
+                          metrics::OmniboxEventProto::INVALID_SPEC,
                           prevent_inline_autocomplete, false, true, true);
   *identified_input_type = input.type();
   autocomplete_->Start(input, false);
   if (!autocomplete_->done())
     base::MessageLoop::current()->Run();
 
   matches_ = autocomplete_->matches();
   if (sort_matches_) {
     for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i)
       i->ComputeStrippedDestinationURL(profile_.get());
@@ skipping 258 matching lines @@
 }
 
 // Make sure the results for the input 'p' don't change between the first and
 // second passes.
 TEST_F(HistoryURLProviderTest, EmptyVisits) {
   // Wait for history to create the in memory DB.
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteInput input(ASCIIToUTF16("p"), base::string16::npos,
                           base::string16(), GURL(),
-                          AutocompleteInput::INVALID_SPEC, false, false, true,
-                          true);
+                          metrics::OmniboxEventProto::INVALID_SPEC, false,
+                          false, true, true);
   autocomplete_->Start(input, false);
   // HistoryURLProvider shouldn't be done (waiting on async results).
   EXPECT_FALSE(autocomplete_->done());
 
   // We should get back an entry for pandora.
   matches_ = autocomplete_->matches();
   ASSERT_GT(matches_.size(), 0u);
   EXPECT_EQ(GURL("http://pandora.com/"), matches_[0].destination_url);
   int pandora_relevance = matches_[0].relevance;
 
@@ skipping 20 matching lines @@
   };
   RunTest(ASCIIToUTF16("slash"), base::string16(), false, navigation_2,
           arraysize(navigation_2));
 
   RunTest(ASCIIToUTF16("this is a query"), base::string16(), false, NULL, 0);
 }
 
 TEST_F(HistoryURLProviderTest, DontAutocompleteOnTrailingWhitespace) {
   AutocompleteInput input(ASCIIToUTF16("slash "), base::string16::npos,
                           base::string16(), GURL(),
-                          AutocompleteInput::INVALID_SPEC, false, false,
-                          true, true);
+                          metrics::OmniboxEventProto::INVALID_SPEC, false,
+                          false, true, true);
   autocomplete_->Start(input, false);
   if (!autocomplete_->done())
     base::MessageLoop::current()->Run();
 
   // None of the matches should attempt to autocomplete.
   matches_ = autocomplete_->matches();
   for (size_t i = 0; i < matches_.size(); ++i) {
     EXPECT_TRUE(matches_[i].inline_autocompletion.empty());
     EXPECT_FALSE(matches_[i].allowed_to_be_default_match);
   }
@@ skipping 44 matching lines @@
       EXPECT_LE(test_cases[i].relevance, matches_[0].relevance);
       EXPECT_LT(matches_[0].relevance, test_cases[i].relevance + 10);
     }
   }
 }
 
 TEST_F(HistoryURLProviderTest, IntranetURLsWithRefs) {
   struct TestCase {
     const char* input;
     int relevance;
-    AutocompleteInput::Type type;
+    metrics::OmniboxInputType::Type type;
   } test_cases[] = {
     { "gooey", 1410, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/", 1410, metrics::OmniboxInputType::URL },
     { "gooey#", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/#", 1200, metrics::OmniboxInputType::URL },
     { "gooey#foo", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/#foo", 1200, metrics::OmniboxInputType::URL },
     { "gooey# foo", 1200, metrics::OmniboxInputType::UNKNOWN },
     { "gooey/# foo", 1200, metrics::OmniboxInputType::URL },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     SCOPED_TRACE(test_cases[i].input);
     const UrlAndLegalDefault output[] = {
         {url_fixer::FixupURL(test_cases[i].input, std::string()).spec(), true}};
-    AutocompleteInput::Type type;
+    metrics::OmniboxInputType::Type type;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, arraysize(output), &type));
     // Actual relevance should be at least what test_cases expects and
     // and no more than 10 more.
     EXPECT_LE(test_cases[i].relevance, matches_[0].relevance);
     EXPECT_LT(matches_[0].relevance, test_cases[i].relevance + 10);
     // Input type should be what we expect.  This is important because
     // this provider counts on SearchProvider to give queries a relevance
     // score >1200 for UNKNOWN inputs and <1200 for URL inputs.  (That's
@@ skipping 74 matching lines @@
 TEST_F(HistoryURLProviderTest, CrashDueToFixup) {
   // This test passes if we don't crash.  The results don't matter.
   const char* const test_cases[] = {
     "//c",
     "\\@st",
     "view-source:x",
   };
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
     AutocompleteInput input(ASCIIToUTF16(test_cases[i]), base::string16::npos,
                             base::string16(), GURL(),
-                            AutocompleteInput::INVALID_SPEC,
+                            metrics::OmniboxEventProto::INVALID_SPEC,
                             false, false, true, true);
     autocomplete_->Start(input, false);
     if (!autocomplete_->done())
       base::MessageLoop::current()->Run();
   }
 }
 
 TEST_F(HistoryURLProviderTest, CullSearchResults) {
   // Set up a default search engine.
   TemplateURLData data;
@@ skipping 97 matching lines @@
       "mailto://a@b.com", {0, npos, npos}, 0 },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     SCOPED_TRACE(testing::Message() << "Index " << i << " input: "
                                     << test_cases[i].input << ", trim_http: "
                                     << test_cases[i].trim_http);
 
     AutocompleteInput input(ASCIIToUTF16(test_cases[i].input),
                             base::string16::npos, base::string16(),
                             GURL("about:blank"),
-                            AutocompleteInput::INVALID_SPEC, false, false, true,
-                            true);
+                            metrics::OmniboxEventProto::INVALID_SPEC, false,
+                            false, true, true);
     AutocompleteMatch match(autocomplete_->SuggestExactInput(
         input.text(), input.canonicalized_url(), test_cases[i].trim_http));
     EXPECT_EQ(ASCIIToUTF16(test_cases[i].contents), match.contents);
     for (size_t match_index = 0; match_index < match.contents_class.size();
          ++match_index) {
       EXPECT_EQ(test_cases[i].offsets[match_index],
                 match.contents_class[match_index].offset);
       EXPECT_EQ(ACMatchClassification::URL |
                 (match_index == test_cases[i].match_classification_index ?
                  ACMatchClassification::MATCH : 0),
@@ skipping 101 matching lines @@
     autocomplete_->scoring_params_.experimental_scoring_enabled = true;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].experiment_relevance,
                 matches_[j].relevance);
     }
   }
 }