Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/autocomplete_result.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/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/autocomplete_match_type.h"
-#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 namespace {
 
 // This class implements a special version of AutocompleteMatch::MoreRelevant
 // that allows matches of particular types to be demoted in AutocompleteResult.
 class CompareWithDemoteByType {
  public:
   CompareWithDemoteByType(
       AutocompleteInput::PageClassification current_page_classification);
 
@@ skipping 218 matching lines @@
         base::ASCIIToUTF16(", input=") +
         input.text();
     DCHECK(default_match_->allowed_to_be_default_match) << debug_info;
     // If the default match is valid (i.e., not a prompt/placeholder), make
     // sure the type of destination is what the user would expect given the
     // input.
     if (default_match_->destination_url.is_valid()) {
       // We shouldn't get query matches for URL inputs, or non-query matches
       // for query inputs.
       if (AutocompleteMatch::IsSearchType(default_match_->type)) {
-        DCHECK_NE(metrics::OmniboxInputType::URL, input.type()) << debug_info;
+        DCHECK_NE(AutocompleteInput::URL, input.type()) << debug_info;
       } else {
-        DCHECK_NE(metrics::OmniboxInputType::FORCED_QUERY, input.type())
-            << debug_info;
+        DCHECK_NE(AutocompleteInput::FORCED_QUERY, input.type()) << debug_info;
       }
     }
   }
 
   // Set the alternate nav URL.
   alternate_nav_url_ = (default_match_ == matches_.end()) ?
       GURL() : ComputeAlternateNavUrl(input, *default_match_);
 }
 
 bool AutocompleteResult::HasCopiedMatches() const {
@@ skipping 77 matching lines @@
 void AutocompleteResult::Validate() const {
   for (const_iterator i(begin()); i != end(); ++i)
     i->Validate();
 }
 #endif
 
 // static
 GURL AutocompleteResult::ComputeAlternateNavUrl(
     const AutocompleteInput& input,
     const AutocompleteMatch& match) {
-  return ((input.type() == metrics::OmniboxInputType::UNKNOWN) &&
+  return ((input.type() == AutocompleteInput::UNKNOWN) &&
           (AutocompleteMatch::IsSearchType(match.type)) &&
           (match.transition != content::PAGE_TRANSITION_KEYWORD) &&
           (input.canonicalized_url() != match.destination_url)) ?
       input.canonicalized_url() : GURL();
 }
 
 void AutocompleteResult::DedupMatchesByDestination(
       AutocompleteInput::PageClassification page_classification,
       bool set_duplicate_matches,
       ACMatches* matches) {
@@ skipping 89 matching lines @@
        i != old_matches.rend() && delta > 0; ++i) {
     if (!HasMatchByDestination(*i, new_matches)) {
       AutocompleteMatch match = *i;
       match.relevance = std::min(max_relevance, match.relevance);
       match.from_previous = true;
       AddMatch(page_classification, match);
       delta--;
     }
   }
 }