Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/builtin_provider.cc

Index: chrome/browser/autocomplete/builtin_provider.cc
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index e9e08cf6ca8b7728d974a8d2f323d932dd0e91c1..615211b5e2f4bf2225405f0c9ddfa704e745f9b7 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -12,7 +12,6 @@
 #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 {
 
@@ -65,9 +64,9 @@
 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);