Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/keyword_provider.h

 // 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.
 //
 // This file contains the keyword autocomplete provider. The keyword provider
 // is responsible for remembering/suggesting user "search keyword queries"
 // (e.g.  "imdb Godzilla") and then fixing them up into valid URLs.  An
 // instance of it gets created and managed by the autocomplete controller.
 // KeywordProvider uses a TemplateURLService to find the set of keywords.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 class KeywordExtensionsDelegate;
 class Profile;
 class TemplateURL;
 class TemplateURLService;
 
 // Autocomplete provider for keyword input.
 //
 // After construction, the autocomplete controller repeatedly calls Start()
 // with some user input, each time expecting to receive a small set of the best
@@ skipping 76 matching lines @@
   // Leading whitespace in |*remaining_input| will be trimmed.
   static bool ExtractKeywordFromInput(const AutocompleteInput& input,
                                       base::string16* keyword,
                                       base::string16* remaining_input);
 
   // Determines the relevance for some input, given its type, whether the user
   // typed the complete keyword, and whether the user is in "prefer keyword
   // matches" mode, and whether the keyword supports replacement.
   // If |allow_exact_keyword_match| is false, the relevance for complete
   // keywords that support replacements is degraded.
-  static int CalculateRelevance(metrics::OmniboxInputType::Type type,
+  static int CalculateRelevance(AutocompleteInput::Type type,
                                 bool complete,
                                 bool support_replacement,
                                 bool prefer_keyword,
                                 bool allow_exact_keyword_match);
 
   // Creates a fully marked-up AutocompleteMatch from the user's input.
   // If |relevance| is negative, calculate a relevance based on heuristics.
   AutocompleteMatch CreateAutocompleteMatch(
       const TemplateURL* template_url,
       const AutocompleteInput& input,
@@ skipping 15 matching lines @@
   TemplateURLService* model_;
 
   // Delegate to handle the extensions-only logic for KeywordProvider.
   // NULL when extensions are not enabled. May be NULL for tests.
   scoped_ptr<KeywordExtensionsDelegate> extensions_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_