Revert of Omnibox: Combine Two Input Type Enums into One (https://codereview.chromium.org/319523005/)

Reason for revert:
Broke the build on http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac

Original issue's description:
> Omnibox: Combine Two Input Type Enums into One
> 
> There are two input type enums:
> * one in the autocomplete code
> * one in the metrics code that's used for UMA logging;
>   this one is meant to remain stable
> 
> As part of fixing the linked bug, I created
> https://codereview.chromium.org/314773002/
> whch needed an input type enum, one which would remain stable.
> It didn't necessarily have to be the metrics enum.
> 
> After discussion with the UMA folks (who deal with how to handle
> stable enum problems all the time), we reached the conclusion
> that we should have one stable enum and use it everywhere.  That's
> the cleanest answer.
> 
> This single enum has to live in the metrics directory because metrics
> is a component.
> 
> This change combines the two existing enums into one, putting the
> new enum in a new file in the metrics directory.  The reason for
> a new file is so we can include it without include the whole
> OmniboxEventProto or any other metrics code.
> 
> The main files to review are autocomplete_input.h and *.proto.
> All other changes are a mechanical result of the changes in
> those three files.
> 
> The internal proto change has been submitted.
> 
> TBR=stevenjb
> for the trivial change to chrome/browser/ui/app_list/search/omnibox_provider.cc
> that removes an unnecessary include
> 
> BUG=284781
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275696

TBR=pkasting@chromium.org,isherman@chromium.org,mpearson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=284781

Review URL: https://codereview.chromium.org/320713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275706 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc
index 4368834..72c99e8 100644
--- a/chrome/browser/autocomplete/autocomplete_provider.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider.cc
@@ -154,7 +154,7 @@ AutocompleteProvider::FixupReturn AutocompleteProvider::FixupUserInput(
   // for hostname beginning with numbers (e.g. input of "17173" will be matched
   // against "0.0.67.21" instead of the original "17173", failing to find
   // "17173.com"), swap the original hostname in for the fixed-up one.
-  if ((input.type() != metrics::OmniboxInputType::URL) &&
+  if ((input.type() != AutocompleteInput::URL) &&
       canonical_gurl.HostIsIPAddress()) {
     std::string original_hostname =
         base::UTF16ToUTF8(input_text.substr(input.parts().host.begin,