Omnibox: Combine Two Input Type Enums into One

components/metrics/proto/omnibox_input_type.proto

Index: components/metrics/proto/omnibox_input_type.proto
diff --git a/components/metrics/proto/omnibox_input_type.proto b/components/metrics/proto/omnibox_input_type.proto
new file mode 100644
index 0000000000000000000000000000000000000000..42a2b7a3cb38486ec0307baf068ba1f47b3a2ee0
--- /dev/null
+++ b/components/metrics/proto/omnibox_input_type.proto
@@ -0,0 +1,27 @@
+// 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.OmniboxInputType;
+
+// What kind of input the user provided.
+// Note that the type below may be misleading.  For example, "http:/" alone

[Mark P, 2014/06/06 00:35:45]

This "Note" came from AutocompleteInput::Type.  The rest of the comment (the
first sentence and the interior variables and their comments) came from
OmniboxEventProto::InputType.

+// cannot be opened as a URL, so it is marked as a QUERY; yet the user
+// probably intends to type more and have it eventually become a URL, so we
+// need to make sure we still run it through inline autocomplete.
+enum Type {
+  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

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

Hmm, it's a little awkward to expose this deprecated value to Chrome code. 
Perhaps we should at least rename it to DEPRECATED_REQUESTED_URL?

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

Done.

Because this longer enum name made it ugly to vertically align comments, I
reformatted the comments to align left and go above the relevant enum name.

+  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 '?'
+}