Update UMA protos from server side versions.

Bug: 755630
Change-Id: I7b6c1c890a68870311411b5f6c7e084052d80f7c
Reviewed-on: https://chromium-review.googlesource.com/609588
Commit-Queue: Steven Holte <holte@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505777}

components/metrics/proto/call_stack_profile.proto

@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Call stack sample data for a given profiling session.
-
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "CallStackProfileProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -14,6 +13,7 @@ package metrics;
 
 import "execution_context.proto";
 
+// Call stack sample data for a given profiling session.
 // Next tag: 5
 message CallStackProfile {
   // Describes an entry in the callstack.
@@ -36,9 +36,10 @@ message CallStackProfile {
     optional int64 count = 2;
 
     // This repeating field indicates the current phase of the system such as
-    // whether it is in startup, general operation, or shutdown. It is a full
-    // list with the first sample and after that each indicates only the new
-    // phases that are achieved.
+    // whether it is in startup, general operation, or shutdown. The first
+    // Sample of a CallStackProfile will list all phases that have been reached;
+    // later samples will list only the new phases that occurred since the
+    // previous one.
     repeated ProcessPhase process_phase = 3;
   }
 

components/metrics/proto/chrome_user_metrics_extension.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.
-//
-// Protocol buffer for Chrome UMA (User Metrics Analysis).
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "ChromeUserMetricsExtensionProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -16,12 +15,12 @@ import "cast_logs.proto";
 import "histogram_event.proto";
 import "memory_leak_report.proto";
 import "omnibox_event.proto";
+import "perf_data.proto";
+import "printer_event.proto";
+import "sampled_profile.proto";
 import "system_profile.proto";
 import "translate_event.proto";
-import "printer_event.proto";
 import "user_action_event.proto";
-import "perf_data.proto";
-import "sampled_profile.proto";
 
 // Next tag: 17
 message ChromeUserMetricsExtension {
@@ -71,7 +70,7 @@ message ChromeUserMetricsExtension {
   repeated TranslateEventProto translate_event = 15;
   repeated PrinterEventProto printer_event = 16;
 
-  // This field is no longer used. Use |sampled_profile| instead.
+  // Deprecated: use |sampled_profile| instead.
   repeated PerfDataProto perf_data = 8 [deprecated=true];
 
   // A list of all collected sample-based profiles since the last UMA upload.

components/metrics/proto/execution_context.proto

@@ -5,6 +5,7 @@
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "ExecutionContextProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -54,20 +55,20 @@ enum Thread {
 // the lifetime of a process.
 enum ProcessPhase {
   // The browser's main message loop has been started.
-  // Based on histogram Startup.BrowserMessageLoopStartTime.
+  // Based on histogram Startup.MessageLoopStartTime
   MAIN_LOOP_START = 0;
 
   // The beginning of navigation in the first web contents' main frame.
-  // Based on histogram Startup.FirstWebContents.MainNavigationStart.
+  // Based on histogram Startup.FirstWebContents.MainNavigationStart
   MAIN_NAVIGATION_START = 1;
 
   // The navigation is committed (first bytes received) in the first web
   // contents' main frame.
-  // Based on histogram Startup.FirstWebContents.MainNavigationFinished.
+  // Based on histogram Startup.FirstWebContents.MainNavigationFinished
   MAIN_NAVIGATION_FINISHED = 2;
 
   // First non-empty paint of the first web contents.
-  // Based on histogram Startup.FirstWebContents.NonEmptyPaint2.
+  // Based on histogram Startup.FirstWebContents.NonEmptyPaint2
   FIRST_NONEMPTY_PAINT = 3;
 
   // Process shutdown has begun.

components/metrics/proto/histogram_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.
-//
-// Histogram-collected metrics.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "HistogramEventProtos";
 option java_package = "org.chromium.components.metrics";
 
 package metrics;
 
+// Histogram-collected metrics.
 // Next tag: 4
 message HistogramEventProto {
   // The name of the histogram, hashed.

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;
+
 option java_outer_classname = "OmniboxEventProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -14,6 +13,7 @@ package metrics;
 
 import "omnibox_input_type.proto";
 
+// Stores information about an omnibox interaction.
 // Next tag: 17
 message OmniboxEventProto {
   // The timestamp for the event, in seconds.
@@ -143,7 +143,7 @@ message OmniboxEventProto {
     APP_MAPS = 12;
 
     // When adding new classifications, please consider adding them in
-    // chrome/browser/resources/omnibox/omnibox.html
+    // chromium's chrome/browser/resources/omnibox/omnibox.html
     // so that these new options are displayed on about:omnibox.
   }
   optional PageClassification current_page_classification = 10;
@@ -166,14 +166,14 @@ message OmniboxEventProto {
     BOOKMARK = 10;         // The user's bookmarks
     ZERO_SUGGEST = 11;     // Suggestions based on the current page
     // This enum value is currently only used by Android GSA. It represents
-    // a suggestion from the phone.
+    // a suggestion from the phone powered by go/icing.
     ON_DEVICE = 12;
     // This enum value is currently only used by Android GSA. It represents
     // a suggestion powered by a Chrome content provider.
     ON_DEVICE_CHROME = 13;
-    CLIPBOARD_URL = 14;    // Suggestion coming from clipboard (iOS only).
-    PHYSICAL_WEB = 15;     // Suggestions triggered by URLs broadcast by nearby
-                           // devices (iOS and Android).
+    CLIPBOARD_URL = 14;  // Suggestion coming from clipboard (iOS only).
+    PHYSICAL_WEB = 15;   // Suggestions triggered by URLs broadcast by nearby
+                         // devices (iOS and Android).
   }
 
   // The result set displayed on the completion popup
@@ -184,8 +184,8 @@ message OmniboxEventProto {
 
     // What kind of result this is.
     // This corresponds to the AutocompleteMatch::Type enumeration in
-    // components/omnibox/autocomplete_match.h (except for Android
-    // GSA result types).
+    // components/omnibox/autocomplete_match.h
+    // (except for Android GSA result types).
     enum ResultType {
       UNKNOWN_RESULT_TYPE = 0;    // Unknown type (should not reach here)
       URL_WHAT_YOU_TYPED = 1;     // The input as a URL
@@ -217,8 +217,8 @@ message OmniboxEventProto {
       BOOKMARK_TITLE = 13;        // A bookmark with a title/url that contains
                                   // the input.
       SEARCH_SUGGEST_ENTITY = 14; // A suggested search for an entity.
-      SEARCH_SUGGEST_TAIL = 15;   // A suggested search to complete the tail
-                                  // of the query.
+      SEARCH_SUGGEST_TAIL = 15;   // A suggested search to complete the tail of
+                                  // the query.
       SEARCH_SUGGEST_PERSONALIZED = 16; // A personalized suggested search.
       SEARCH_SUGGEST_PROFILE = 17;  // A personalized suggested search for a
                                     // Google+ profile.
@@ -236,11 +236,11 @@ message OmniboxEventProto {
                                     // used by Android GSA for on-device
                                     // suggestion logging.
       NAVSUGGEST_PERSONALIZED = 21; // A personalized url.
-      SEARCH_SUGGEST_ANSWER   = 22; // DEPRECATED. Answers no longer have their
+      SEARCH_SUGGEST_ANSWER = 22;   // DEPRECATED. Answers no longer have their
                                     // own type but instead can be attached to
                                     // suggestions of any type.
       CALCULATOR              = 23; // A calculator answer.
-      CLIPBOARD               = 24; // An URL based on the clipboard.
+      CLIPBOARD = 24;               // An URL based on the clipboard.
       PHYSICAL_WEB            = 25; // A Physical Web nearby URL.
       PHYSICAL_WEB_OVERFLOW   = 26; // An item representing multiple Physical
                                     // Web nearby URLs.

components/metrics/proto/omnibox_input_type.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;
+
 option java_outer_classname = "OmniboxInputTypeProtos";
 option java_package = "org.chromium.components.metrics";
 
 package metrics;
 
+// Stores information about an omnibox interaction.
 // What kind of input the user provided.
 // Note that the type below may be misleading.  For example, "http:/" alone
 // cannot be opened as a URL, so it is marked as a QUERY; yet the user

components/metrics/proto/printer_event.proto

 // Copyright 2017 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 printer configuration attempts.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "PrinterEventProtos";
 option java_package = "org.chromium.components.metrics";
 

components/metrics/proto/sampled_profile.proto

@@ -5,15 +5,16 @@
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "SampledProfileProtos";
 option java_package = "org.chromium.components.metrics";
 
 package metrics;
 
-import "call_stack_profile.proto";
 import "execution_context.proto";
 import "perf_data.proto";
 import "perf_stat.proto";
+import "call_stack_profile.proto";
 
 // Protocol buffer for collected sample-based profiling data.
 // Contains the parameters and data from a single profile collection event.

components/metrics/proto/system_profile.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 the user's brower and system configuration.
-// The system configuration fields are recorded once per client session.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "SystemProfileProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -15,6 +13,8 @@ package metrics;
 
 import "extension_install.proto";
 
+// Stores information about the user's brower and system configuration.
+// The system configuration fields are recorded once per client session.
 // Next tag: 26
 message SystemProfileProto {
   // The time when the client was compiled/linked, in seconds since the epoch.
@@ -65,7 +65,7 @@ message SystemProfileProto {
   // The date the user enabled UMA, in seconds since the epoch.
   // If the user has toggled the UMA enabled state multiple times, this will
   // be the most recent date on which UMA was enabled.
-  // For privacy, this is rounded to the nearest hour.
+  // For privacy, this is rounded to the nearest hour (M30+).
   optional int64 uma_enabled_date = 3;
 
   // The time when the client was installed, in seconds since the epoch.
@@ -101,8 +101,8 @@ message SystemProfileProto {
   }
   optional OS os = 5;
 
-  // Next tag for Hardware: 18
   // Information on the user's hardware.
+  // Next tag: 18
   message Hardware {
     // The CPU architecture (x86, PowerPC, x86_64, ...)
     optional string cpu_architecture = 1;
@@ -115,8 +115,12 @@ message SystemProfileProto {
     optional int64 dll_base = 3;
 
     // The hardware_class describes the current machine model, e.g. "MacPro1,1"
-    // on Mac, or "Nexus 5" on Android. Only implemented on OS X, Android, and
-    // Chrome OS.
+    // on Mac, "iPhone9,3" on iOS or "Nexus 5" on Android. Implemented on OS X,
+    // iOS, Android, Chrome OS.
+    //
+    // The iOS device hardware class was added in Chrome M60 release. Prior
+    // to that, device hardware class was incorrectly recorded in
+    // cpu_architecture field.
     //
     // For Chrome OS, the device hardware class ID is a unique string associated
     // with each Chrome OS device product revision generally assigned at
@@ -151,7 +155,8 @@ message SystemProfileProto {
       // The signature reported by CPUID (from EAX).
       optional uint32 signature = 2;
 
-      // Number of logical processors/cores on the current machine.
+      // Number of logical processors/cores on the current machine, which
+      // includes hyperthreaded cores.
       optional uint32 num_cores = 3;
     }
     optional CPU cpu = 13;
@@ -329,13 +334,13 @@ message SystemProfileProto {
 
     // Describe wifi access point information.
     message WifiAccessPoint {
-      // Vendor prefix of the access point's BSSID, these are OUIs
+      // Vendor prefix of the access point's BSSID. These are OUIs
       // (Organizationally Unique Identifiers) registered by
       // the IEEE and are encoded with the first byte in bits 16-23, the
       // second byte in bits 8-15 and the third byte in bits 0-7.
       optional uint32 vendor_prefix = 1;
 
-      // Access point seurity mode definitions.
+      // Access point security mode definitions.
       enum SecurityMode {
         SECURITY_UNKNOWN = 0;
         SECURITY_WPA = 1;
@@ -358,7 +363,7 @@ message SystemProfileProto {
         optional string model_name = 2;
 
         // The device name (sometimes the same as the model_number),
-        // for example "Dummynet"
+        // for example "Dummynet".
         optional string device_name = 3;
 
         // The list of vendor-specific OUIs (Organziationally Unqiue
@@ -370,7 +375,7 @@ message SystemProfileProto {
       // The wireless access point vendor information.
       optional VendorInformation vendor_info = 3;
     }
-    // Information of the wireless AP that device is connected to.
+    // Information of the wireless access point that device is connected to.
     optional WifiAccessPoint access_point_info = 5;
 
     // Derived from net::NetworkQualityEstimator::EffectiveConnectionType
@@ -386,6 +391,7 @@ message SystemProfileProto {
       EFFECTIVE_CONNECTION_TYPE_3G = 5;
       EFFECTIVE_CONNECTION_TYPE_4G = 6;
     }
+
     // Deprecated: The connection type according to
     // net::NetworkQualityEstimator. EffectiveConnectionType is the connection
     // type whose typical performance is most similar to the measured
@@ -418,7 +424,7 @@ message SystemProfileProto {
     optional int64 last_automatic_start_timestamp = 2;
 
     // The date at which Google Update last successfully sent an update check
-    // and recieved an intact response from the server, in seconds since the
+    // and received an intact response from the server, in seconds since the
     // Unix epoch. (The updates don't need to be successfully installed.)
     optional int64 last_update_check_timestamp = 3;
 
@@ -770,7 +776,7 @@ message SystemProfileProto {
     // Dolby vision support.
     optional bool dolby_vision_support = 19;
 
-    // Supported EOTFs.
+    // Supported EOTF's.
     // EOTF support according to the spec:
     //   eotf_support & 0x1 -> SDR supported
     //   (eotf_support > 1) & 0x1 -> traditional HDR supported
@@ -793,8 +799,8 @@ message SystemProfileProto {
 
   // Information about the current wireless access point. Collected directly
   // from the wireless access point via standard apis if the device is
-  // connected to the Internet wirelessly.
-  // This is only used by Chromecast family.
+  // connected to the Internet wirelessly. Introduced for Chrome on TV devices
+  // but also can be collected by ChromeOS, Android or other clients.
   message ExternalAccessPoint {
     // The manufacturer name, for example "ASUSTeK Computer Inc.".
     optional string manufacturer = 1;
@@ -908,7 +914,7 @@ message SystemProfileProto {
   repeated AntiVirusProduct antivirus_product = 23;
 
   enum ComponentId {
-    // Represents any component that is not one of the below.
+    // The client transmitted a component ID the server does not recognize.
     UNKNOWN = 1;
 
     // All the following are various components.
@@ -925,6 +931,8 @@ message SystemProfileProto {
     SW_REPORTER = 12;
     WIDEVINE_CDM = 13;
     EPSON_INKJET_PRINTER_ESCPR = 14;
+    CROS_TERMINA = 15;
+    STAR_CUPS_DRIVER = 16;
   }
 
   // Information about what Chrome components are registered and at which

components/metrics/proto/translate_event.proto

 // Copyright 2016 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 translate UI, translate Ranekr and user interaction.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "TranslateEventProtos";
 option java_package = "org.chromium.components.metrics";
 
@@ -27,8 +26,8 @@ message TranslateEventProto {
   // Target language of the translation.
   optional string target_language = 2;
 
-  // The country where the user is. 2-letter country code. This
-  // corresponds to the stored permanent country in VariationsService.
+  // The country where the user is. 2-letter country code. This corresponds to
+  // the stored permanent country in VariationsService.
   optional string country = 14;
 
   // The following counts are extracted from TranslatePrefs.
@@ -67,7 +66,7 @@ message TranslateEventProto {
   optional RankerResponse ranker_response = 9;
 
   // The action performed by the user in the translate UI.
-  // Next tag 28.
+  // Next tag: 28
   enum EventType {
     // The feedback event does not correspond to any of the enumerated
     // cases.

components/metrics/proto/ukm/entry.proto

@@ -4,10 +4,10 @@
 
 syntax = "proto2";
 
-package ukm;
-
 option optimize_for = LITE_RUNTIME;
 
+package ukm;
+
 // Next tag: 6
 message Entry {
   // Unique identifier for an Event. This is used to provide hierarchical

components/metrics/proto/ukm/report.proto

@@ -4,16 +4,16 @@
 
 syntax = "proto2";
 
-package ukm;
-
 option optimize_for = LITE_RUNTIME;
 
+package ukm;
+
 import "ukm/entry.proto";
 import "ukm/source.proto";
 import "system_profile.proto";
 
 // This is the message type sent from Chrome to the UKM collector.
-// Next tag: 6
+// Next tag: 7
 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.

components/metrics/proto/ukm/source.proto

@@ -4,10 +4,10 @@
 
 syntax = "proto2";
 
-package ukm;
-
 option optimize_for = LITE_RUNTIME;
 
+package ukm;
+
 // Source contains data related to a top-level navigation.
 // Next tag: 8
 message Source {
@@ -18,7 +18,9 @@ message Source {
   // discovered by Google's crawler, it should not be recorded.
   optional string url = 2;
 
-  // The origin of the URL. This is reserved to be used by server side only.
+  // The origin of the URL (ex. "http://docs.google.com" if the URL is something
+  // like "http://docs.google.com/some_doc_hash"). This field is populated
+  // server-side and should never be filled in by clients.
   reserved 5;
   reserved "url_origin";
 
@@ -34,7 +36,7 @@ message Source {
   // events related to this Source will generally be relative to this timestamp.
   optional int64 navigation_time_msec = 3;
 
-  // Time between navigation and the first contentful paint, in
-  // milliseconds. Deprecated. Use ukm::Entry instead.
+  // Time between navigation and the first contentful paint, in milliseconds.
+  // Deprecated. Use ukm::Entry instead.
   optional int64 first_contentful_paint_msec = 4 [deprecated = true];
 }

components/metrics/proto/user_action_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 event that occurs in response to a user action,
-// e.g. an interaction with a browser UI element.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
+
 option java_outer_classname = "UserActionEventProtos";
 option java_package = "org.chromium.components.metrics";
 
 package metrics;
 
+// Stores information about an event that occurs in response to a user action,
+// e.g. an interaction with a browser UI element.
 // Next tag: 3
 message UserActionEventProto {
   // The name of the action, hashed.