Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/builtin_provider.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/builtin_provider.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/history_provider.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/url_constants.h"
-#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 namespace {
 
 #if !defined(OS_ANDROID)
 // This list should be kept in sync with chrome/common/url_constants.h.
 // Only include useful sub-pages, confirmation alerts are not useful.
 const char* const kChromeSettingsSubPages[] = {
   chrome::kAutofillSubPage,
   chrome::kClearBrowserDataSubPage,
   chrome::kContentSettingsSubPage,
@@ skipping 32 matching lines @@
   for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) {
     builtins_.push_back(
         settings + base::ASCIIToUTF16(kChromeSettingsSubPages[i]));
   }
 #endif
 }
 
 void BuiltinProvider::Start(const AutocompleteInput& input,
                             bool minimal_changes) {
   matches_.clear();
-  if ((input.type() == metrics::OmniboxInputType::INVALID) ||
-      (input.type() == metrics::OmniboxInputType::FORCED_QUERY) ||
-      (input.type() == metrics::OmniboxInputType::QUERY))
+  if ((input.type() == AutocompleteInput::INVALID) ||
+      (input.type() == AutocompleteInput::FORCED_QUERY) ||
+      (input.type() == AutocompleteInput::QUERY))
     return;
 
   const size_t kAboutSchemeLength = strlen(content::kAboutScheme);
   const base::string16 kAbout = base::ASCIIToUTF16(content::kAboutScheme) +
       base::ASCIIToUTF16(url::kStandardSchemeSeparator);
   const base::string16 kChrome = base::ASCIIToUTF16(content::kChromeUIScheme) +
       base::ASCIIToUTF16(url::kStandardSchemeSeparator);
 
   const int kUrl = ACMatchClassification::URL;
   const int kMatch = kUrl | ACMatchClassification::MATCH;
@@ skipping 80 matching lines @@
                                const ACMatchClassifications& styles) {
   AutocompleteMatch match(this, kRelevance, false,
                           AutocompleteMatchType::NAVSUGGEST);
   match.fill_into_edit = match_string;
   match.inline_autocompletion = inline_completion;
   match.destination_url = GURL(match_string);
   match.contents = match_string;
   match.contents_class = styles;
   matches_.push_back(match);
 }