Sync metrics protos with google3

- Adds keyword-suggestions fields to omnibox_event.proto.
- Renames is_asan_build to is_instrumented_build.

Bug: 889105, 837395
Change-Id: Ic3264ff6052af46770ce63df2d7a189c5643ace3
Reviewed-on: https://chromium-review.googlesource.com/c/1292849Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601653}

components/metrics/metrics_log.cc

@@ -152,8 +152,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServiceClient* client,
 
 #if defined(ADDRESS_SANITIZER) || DCHECK_IS_ON()
   // Set if a build is instrumented (e.g. built with ASAN, or with DCHECKs).
-  // TODO(889105): Field will be renamed to is_instrumented_build up-stream.
-  system_profile->set_is_asan_build(true);
+  system_profile->set_is_instrumented_build(true);
 #endif
 
   metrics::SystemProfileProto::Hardware* hardware =

components/metrics/metrics_log_unittest.cc

@@ -138,8 +138,7 @@ TEST_F(MetricsLogTest, BasicRecord) {
   system_profile->set_application_locale(client.GetApplicationLocale());
 
 #if defined(ADDRESS_SANITIZER) || DCHECK_IS_ON()
-  // TODO(889105): Field will be renamed to is_instrumented_build up-stream.
-  system_profile->set_is_asan_build(true);
+  system_profile->set_is_instrumented_build(true);
 #endif
   metrics::SystemProfileProto::Hardware* hardware =
       system_profile->mutable_hardware();

third_party/metrics_proto/README.chromium

 Name: Metrics Protos
 Short Name: metrics_proto
 URL: This is the canonical public repository
-Version: 214990311
-Date: 2018/09/28 UTC
+Version: 217960420
+Date: 2018/10/20 UTC
 License: BSD
 Security Critical: Yes
 

third_party/metrics_proto/omnibox_event.proto

@@ -14,7 +14,7 @@ package metrics;
 import "omnibox_input_type.proto";
 
 // Stores information about an omnibox interaction.
-// Next tag: 19
+// Next tag: 21
 message OmniboxEventProto {
   // The timestamp for the event, in seconds.
   // This value comes from Chromium's TimeTicks::Now(), which is an abstract
@@ -200,7 +200,7 @@ message OmniboxEventProto {
   }
 
   // The result set displayed on the completion popup
-  // Next tag: 9
+  // Next tag: 10
   message Suggestion {
     // Where does this result come from?
     optional ProviderType provider = 1;
@@ -296,6 +296,15 @@ message OmniboxEventProto {
     // Whether the suggestion presented in the match, regardless of type,
     // matched an open tab.
     optional bool has_tab_match = 8;
+
+    // The Omnibox search provider generates 2 fundamental types of
+    // suggestions: Traditional search suggestions, which throw the terms
+    // against the default search engine (DSE), and keyword search suggestions,
+    // which throw the terms against the search engine selected when the user
+    // initiates keyword mode (which may also be the DSE). When
+    // |is_keyword_suggestion| is true, this suggestion originated from the
+    // latter.
+    optional bool is_keyword_suggestion = 9;
   }
   repeated Suggestion suggestion = 9;
 
@@ -336,4 +345,27 @@ message OmniboxEventProto {
   // A list of diagnostic information about each provider.  Providers
   // will appear at most once in this list.
   repeated ProviderInfo provider_info = 12;
+
+  // Whether the Omnibox was in keyword mode, however it was entered.
+  optional bool in_keyword_mode = 19;
+
+  // How the Omnibox got into keyword mode. Not present if not in keyword
+  // mode.
+  enum KeywordModeEntryMethod {
+    INVALID = 0;
+    TAB = 1;                // Select a suggestion that provides a keyword hint
+                            // and press Tab.
+    SPACE_AT_END = 2;       // Type a complete keyword and press Space.
+    SPACE_IN_MIDDLE = 3;    // Press Space in the middle of an input in order to
+                            // separate it into a keyword and other text.
+    KEYBOARD_SHORTCUT = 4;  // Press ^K.
+    QUESTION_MARK = 5;      // Press Question-mark without any other input.
+    CLICK_HINT_VIEW = 6;    // Select a suggestion that provides a keyword hint
+                            // and click the reminder that one can press Tab.
+    TAP_HINT_VIEW = 7;      // Select a suggestion that provides a keyword hint
+                            // and touch the reminder that one can press Tab.
+    SELECT_SUGGESTION = 8;  // Select a keyword suggestion, such as by arrowing
+                            // or tabbing to it.
+  }
+  optional KeywordModeEntryMethod keyword_mode_entry_method = 20;
 }

third_party/metrics_proto/system_profile.proto

@@ -59,8 +59,10 @@ message SystemProfileProto {
   }
   optional Channel channel = 10;
 
-  // True if Chrome build is ASan-instrumented.
-  optional bool is_asan_build = 20 [default = false];
+  // True if Chrome build is instrumented (e.g. built with ASAN instrumentation
+  // or with DCHECKs enabled).
+  // This field was renamed from |is_asan_build| to reflect its actual meaning.
+  optional bool is_instrumented_build = 20 [default = false];
 
   // The date the user enabled UMA, in seconds since the epoch.
   // If the user has toggled the UMA enabled state multiple times, this will