[tools/perf] Add app and device usage to WebView power metric

Since webview_power_usage.sql now calculates app power usage and total
device power usage, this change updates the corresponding tbmv3 metric
to output these values.

Bug: b/159154163
Change-Id: Ia0f788e357837e056ed04b1bd252f9a26d2d07de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354834Reviewed-by: Mikhail Khokhlov <khokhlov@google.com>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798739}

tools/perf/core/tbmv3/metrics/webview_power_usage_metric.proto

@@ -12,13 +12,15 @@ import "protos/perfetto/metrics/custom_options.proto";
 // Output values are in milliampere-seconds.
 
 message EstimatedWebViewAppPowerUsage {
-  string app_name = 1;  // process name
+  // Host app package name.
+  string app_name = 1;
 
-  // total app’s power consumption in milliampere-seconds
-  // TODO(b/159154163): make this required.
-  optional double total_app_power_mas = 2;
+  // Total app’s power consumption in milliampere-seconds.
+  // Includes renderer processes.
+  double total_app_power_mas = 2;
 
-  // this is the sum of the following 3 fields
+  // This is the sum of the following 3 fields.
+  // Includes renderer processes.
   double webview_power_mas = 3;
 
   // TODO(b/159154263): make this required.
@@ -29,6 +31,9 @@ message EstimatedWebViewAppPowerUsage {
 
 message WebViewPowerUsageMetric {
   repeated EstimatedWebViewAppPowerUsage estimated_webview_app_power_usage = 1;
+
+  // Total power usage of the device (all apps).
+  double total_device_power_mas = 2;
 }
 
 extend TraceMetrics {

tools/perf/core/tbmv3/metrics/webview_power_usage_metric.sql

@@ -14,9 +14,12 @@ SELECT WebViewPowerUsageMetric(
   (SELECT RepeatedField(
       EstimatedWebViewAppPowerUsage(
         'app_name', app_name,
-        'webview_power_mas', webview_power_mas
-      )
+        'webview_power_mas', webview_power_mas,
+        'total_app_power_mas', total_app_power_mas
+       )
    )
    FROM webview_power_summary
-  )
+  ),
+  'total_device_power_mas',
+  (SELECT power_mas FROM total_device_power)
 );