Revert of Omnibox: Combine Two Input Type Enums into One

components/metrics/proto/omnibox_event.proto

 // Copyright 2014 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.
 //
 // Stores information about an omnibox interaction.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package metrics;
 
-import "omnibox_input_type.proto";
-
 // Next tag: 17
 message OmniboxEventProto {
   // The timestamp for the event, in seconds since the epoch.
   optional int64 time = 1;
 
   // The id of the originating tab for this omnibox interaction.
   // This is the current tab *unless* the user opened the target in a new tab.
   // In those cases, this is unset.  Tab ids are unique for a given session_id
   // (in the containing protocol buffer ChromeUserMetricsExtensionProto).
   optional int32 tab_id = 2;
@@ skipping 100 matching lines @@
     // replacement, meaning the URL of the page should've appeared in the
     // omnibox before the user started editing it, not the search terms.
     SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT = 9;
 
     // When adding new classifications, please consider adding them in
     // chrome/browser/resources/omnibox/omnibox.html
     // so that these new options are displayed on about:omnibox.
   }
   optional PageClassification current_page_classification = 10;
 
-  optional OmniboxInputType.Type input_type = 8;
+  // What kind of input the user provided.
+  enum InputType {
+    INVALID = 0;        // Empty input (should not reach here)
+    UNKNOWN = 1;        // Valid input whose type cannot be determined
+    REQUESTED_URL = 2;  // DEPRECATED. Input autodetected as UNKNOWN, which the
+                        // user wants to treat as an URL by specifying a
+                        // desired_tld
+    URL = 3;            // Input autodetected as a URL
+    QUERY = 4;          // Input autodetected as a query
+    FORCED_QUERY = 5;   // Input forced to be a query by an initial '?'
+  }
+  optional InputType input_type = 8;
 
   // An enum used in multiple places below.
   enum ProviderType {
     UNKNOWN_PROVIDER = 0;  // Unknown provider (should not reach here)
     HISTORY_URL = 1;       // URLs in history, or user-typed URLs
     HISTORY_CONTENTS = 2;  // Matches for page contents of pages in history
     HISTORY_QUICK = 3;     // Matches for recently or frequently visited pages
                            // in history
     SEARCH = 4;            // Search suggestions for the default search engine
     KEYWORD = 5;           // Keyword-triggered searches
@@ skipping 106 matching lines @@
     // The number of times this provider returned a non-zero number of
     // suggestions during this omnibox session.
     // Note that each provider may define a session differently for its
     // purposes.
     optional int32 times_returned_results_in_session = 5;
   }
   // A list of diagnostic information about each provider.  Providers
   // will appear at most once in this list.
   repeated ProviderInfo provider_info = 12;
 }