Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/search_provider.h

Index: chrome/browser/autocomplete/search_provider.h
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index e2be361d92b8ab0893cb0641e14223eb98a24fb9..d2e5dd7a5bf08165ccc54374b13793ff7dd865d6 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -19,6 +19,7 @@
 #include "chrome/browser/autocomplete/base_search_provider.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 class Profile;
 class SearchProviderTest;
@@ -137,8 +138,8 @@ class SearchProvider : public BaseSearchProvider {
 
   // Calculates the relevance score for the keyword verbatim result (if the
   // input matches one of the profile's keyword).
-  static int CalculateRelevanceForKeywordVerbatim(AutocompleteInput::Type type,
-                                                  bool prefer_keyword);
+  static int CalculateRelevanceForKeywordVerbatim(
+      metrics::OmniboxInputType::Type type, bool prefer_keyword);

[Ilya Sherman, 2014/06/06 05:01:01]

nit: In header files, params should always be one per line if the entire method
signature does not fit on a single line.  You might want to run "git cl format"
over your CL (and double check that its output is reasonable).

[Mark P, 2014/06/06 20:22:51]

Done.
I ran it.  It didn't do much.  I accepted a suggestion or two.  Mostly it
disagrees with current code about how to format ternary operators.

 
   // AutocompleteProvider:
   virtual void Start(const AutocompleteInput& input,