AW UMA: Roll metrics proto

This is a roll using my internal change to the exporter script
(http://cl/274893271). The main motivation is to roll the change to the
BUILD.gn file (to get the proto_java_library target), although this
also rolls miscellaneous proto changes which have landed since the last
roll.

Bug: 1011991
Test: None
Change-Id: Ibcbe003f0c386bd2081944c77ecc26a3cd88d559
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862727
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706222}

third_party/metrics_proto/BUILD.gn

@@ -4,32 +4,45 @@
 
 import("//third_party/protobuf/proto_library.gni")
 
+if (is_android) {
+  import("//build/config/android/rules.gni")
+}
+
+_proto_files = [
+  "call_stack_profile.proto",
+  "cast_logs.proto",
+  "chrome_os_app_list_launch_event.proto",
+  "chrome_user_metrics_extension.proto",
+  "execution_context.proto",
+  "extension_install.proto",
+  "histogram_event.proto",
+  "memory_leak_report.proto",
+  "omnibox_event.proto",
+  "omnibox_input_type.proto",
+  "perf_data.proto",
+  "perf_stat.proto",
+  "printer_event.proto",
+  "reporting_info.proto",
+  "sampled_profile.proto",
+  "system_profile.proto",
+  "trace_log.proto",
+  "translate_event.proto",
+  "ukm/aggregate.proto",
+  "ukm/entry.proto",
+  "ukm/report.proto",
+  "ukm/source.proto",
+  "user_action_event.proto",
+  "user_demographics.proto",
+]
+
 proto_library("metrics_proto") {
-  sources = [
-    "call_stack_profile.proto",
-    "cast_logs.proto",
-    "chrome_os_app_list_launch_event.proto",
-    "chrome_user_metrics_extension.proto",
-    "execution_context.proto",
-    "extension_install.proto",
-    "histogram_event.proto",
-    "memory_leak_report.proto",
-    "omnibox_event.proto",
-    "omnibox_input_type.proto",
-    "perf_data.proto",
-    "perf_stat.proto",
-    "printer_event.proto",
-    "reporting_info.proto",
-    "sampled_profile.proto",
-    "system_profile.proto",
-    "trace_log.proto",
-    "translate_event.proto",
-    "ukm/aggregate.proto",
-    "ukm/entry.proto",
-    "ukm/report.proto",
-    "ukm/source.proto",
-    "user_action_event.proto",
-    "user_demographics.proto",
-  ]
+  sources = _proto_files
   proto_in_dir = "."
 }
+
+if (is_android) {
+  proto_java_library("metrics_proto_java") {
+    proto_path = "."
+    sources = _proto_files
+  }
+}

third_party/metrics_proto/README.chromium

 Name: Metrics Protos
 Short Name: metrics_proto
 URL: This is the canonical public repository
-Version: 270927279
-Date: 2019/09/24 UTC
+Version: 274892279
+Date: 2019/10/15 UTC
 License: BSD
 Security Critical: Yes
 

third_party/metrics_proto/cast_logs.proto

@@ -17,7 +17,7 @@ message CastLogsProto {
   // Next tag: 7
   message CastDeviceInfo {
     // The product type of Cast device sent from Cast-enabled devices.
-    // Next tag: 9
+    // Next tag: 10
     enum CastProductType {
       CAST_PRODUCT_TYPE_UNKNOWN = 0;
       CAST_PRODUCT_TYPE_CHROMECAST = 1;
@@ -28,6 +28,7 @@ message CastLogsProto {
       CAST_PRODUCT_TYPE_ANDROID_THINGS = 6;
       CAST_PRODUCT_TYPE_CHROME_OS = 7;
       CAST_PRODUCT_TYPE_FUCHSIA_OS = 8;
+      CAST_PRODUCT_TYPE_LITE = 9;
     }
     optional CastProductType type = 1;
 

third_party/metrics_proto/ukm/report.proto

@@ -12,9 +12,10 @@ import "ukm/aggregate.proto";
 import "ukm/entry.proto";
 import "ukm/source.proto";
 import "system_profile.proto";
+import "user_demographics.proto";
 
 // This is the message type sent from Chrome to the UKM collector.
-// Next tag: 11
+// Next tag: 12
 message Report {
   // A unique identifier for a Chrome install. This ID should be used only
   // in UKM reports, and not linked to any other data sources.
@@ -45,6 +46,11 @@ message Report {
   // Information about the user's browser and system configuration.
   optional metrics.SystemProfileProto system_profile = 2;
 
+  // The user's demographic information that consists of their noised birth year
+  // and gender. This data is made available to Chrome via syncable priority
+  // pref, so is only available if the user is signed-in and syncing.
+  optional metrics.UserDemographicsProto user_demographics = 11;
+
   // A list of the top-level navigations that data was collected for.
   repeated Source sources = 3;