Remove AutocompleteInput Type and PageClassification.

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>
 
@@ skipping 243 matching lines @@
     {"frank",                 1, {{{0, 5}, {8, 13}, {16, 21}, {0, 0}}}},
     {"frankly",               1, {{{0, 7}, {8, 15}, {0, 0}}}},
     {"frankly frankly",       1, {{{0, 7}, {8, 15}, {0, 0}}}},
     {"foobar foo",            1, {{{0, 6}, {7, 13}, {0, 0}}}},
     {"foo foobar",            1, {{{0, 6}, {7, 13}, {0, 0}}}},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
-                            AutocompleteInput::INVALID_SPEC, false, false,
-                            false, true);
+                            metrics::OmniboxEventProto::INVALID_SPEC, false,
+                            false, false, true);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number of results is as expected.
     EXPECT_LE(matches.size(), query_data[i].match_count)
         << "One or more of the following matches were unexpected:\n"
         << MatchesAsString16(matches)
         << "For query '" << query_data[i].query << "'.";
     EXPECT_GE(matches.size(), query_data[i].match_count)
         << "One or more expected matches are missing. Matches found:\n"
         << MatchesAsString16(matches)
@@ skipping 55 matching lines @@
     // Ranking of prefix matches with URL boost. Note that a query of
     // "worm burn" will have the same results.
     {"burn worm", 3, {"burning worms #2",    // boosted
                       "worming burns #20",   // boosted
                       "burning worms #1"}},  // not boosted but shorter
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
-                            AutocompleteInput::INVALID_SPEC, false, false,
-                            false, true);
+                            metrics::OmniboxEventProto::INVALID_SPEC, false,
+                            false, false, true);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number and content of results is as expected.
     for (size_t j = 0; j < std::max(query_data[i].match_count, matches.size());
          ++j) {
       EXPECT_LT(j, query_data[i].match_count) << "    Unexpected match '"
           << base::UTF16ToUTF8(matches[j].description) << "' for query: '"
           <<  query_data[i].query << "'.";
       if (j >= query_data[i].match_count)
         continue;
@@ skipping 34 matching lines @@
     // need to be in the bookmarks list because BookmarkProvider's
     // TitleMatchToACMatch() has an assertion that verifies the URL is
     // actually bookmarked.
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     const std::string description = "for query=" + query_data[i].query +
         " and url=" + query_data[i].url;
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, base::string16(), GURL(),
-                            AutocompleteInput::INVALID_SPEC, false, false,
-                            false, true);
+                            metrics::OmniboxEventProto::INVALID_SPEC, false,
+                            false, false, true);
     const base::string16 fixed_up_input(
         provider_->FixupUserInput(input).second);
     BookmarkNode node(GURL(query_data[i].url));
     node.SetTitle(base::ASCIIToUTF16(query_data[i].url));
     BookmarkMatch bookmark_match;
     bookmark_match.node = &node;
     const AutocompleteMatch& ac_match = provider_->BookmarkMatchToACMatch(
         input, fixed_up_input, bookmark_match);
     EXPECT_EQ(query_data[i].allowed_to_be_default_match,
               ac_match.allowed_to_be_default_match) << description;
@@ skipping 24 matching lines @@
   };
 
   // Reload the bookmarks index with |index_urls| == 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);
+                            metrics::OmniboxEventProto::INVALID_SPEC, false,
+                            false, false, true);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     ASSERT_EQ(1U, matches.size()) << description;
     const AutocompleteMatch& match = matches[0];
     EXPECT_EQ(base::ASCIIToUTF16(query_data[i].expected_contents),
               match.contents) << description;
     std::vector<std::string> class_strings;
     base::SplitString(
         query_data[i].expected_contents_class, ',', &class_strings);
     ASSERT_EQ(class_strings.size(), match.contents_class.size())
         << description;
     for (size_t i = 0; i < class_strings.size(); ++i) {
       std::vector<std::string> chunks;
       base::SplitString(class_strings[i], ':', &chunks);
       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;
     }
   }
 }