Manual Roll src/third_party/perfetto c98edc42336f..00e6685b05e8 (6 commits)

https://android.googlesource.com/platform/external/perfetto.git/+log/c98edc42336f..00e6685b05e8

git log c98edc42336f..00e6685b05e8 --date=short --first-parent --format='%ad %ae %s'
2020-04-08 treehugger-gerrit@google.com Merge "perfetto-ui: Fix rounding of merged slice percents"
2020-04-08 lalitm@google.com Merge "tp: add documentation for trace analysis feature"
2020-04-08 treehugger-gerrit@google.com Merge "base: round two of trying to fix vs2019"
2020-04-08 treehugger-gerrit@google.com Merge "TrackEvent: Fix compatibility issues with Clang 11 on macOS"
2020-04-08 lalitm@google.com Merge "tp: fix inconsistency of base::optional<StringId> column API"
2020-04-08 primiano@google.com service: Emit a marker when all data source started

Created with:
  gclient setdep -r src/third_party/perfetto@00e6685b05e8

Bug: chromium:150960749
Change-Id: Ieaac915d9c4d2c0325abaac326346cdb5e998065
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142034
Auto-Submit: Primiano Tucci <primiano@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757769}

DEPS

@@ -1235,7 +1235,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'c98edc42336fbf508cec873654b7e13ee2866bc9',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + '00e6685b05e8fb6f36f94c92bf0372b87b56d430',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',

services/tracing/public/cpp/perfetto/perfetto_config.cc

@@ -70,6 +70,7 @@ perfetto::TraceConfig GetDefaultPerfettoConfig(
   auto* builtin_data_sources = perfetto_config.mutable_builtin_data_sources();
   builtin_data_sources->set_disable_trace_config(privacy_filtering_enabled);
   builtin_data_sources->set_disable_system_info(privacy_filtering_enabled);
+  builtin_data_sources->set_disable_service_events(privacy_filtering_enabled);
 
   // Clear incremental state every 5 seconds, so that we lose at most the first
   // 5 seconds of the trace (if we wrap around perfetto's central buffer).

services/tracing/public/mojom/perfetto_service.mojom

@@ -170,10 +170,13 @@ struct DataSource {
   array<string> producer_name_filter;
 };
 
+// Allows to disable the built-in data sources implicitly enabled in the tracing service.
+// See comments in third_party/perfetto/protos/perfetto/config/trace_config.proto.
 struct PerfettoBuiltinDataSource {
   bool disable_clock_snapshotting;
   bool disable_trace_config;
   bool disable_system_info;
+  bool disable_service_events;
 };
 
 struct IncrementalStateConfig {

services/tracing/public/mojom/trace_config_mojom_traits.cc

@@ -56,6 +56,7 @@ bool StructTraits<tracing::mojom::PerfettoBuiltinDataSourceDataView,
   out->set_disable_clock_snapshotting(data.disable_clock_snapshotting());
   out->set_disable_trace_config(data.disable_trace_config());
   out->set_disable_system_info(data.disable_system_info());
+  out->set_disable_service_events(data.disable_service_events());
   return true;
 }
 

services/tracing/public/mojom/trace_config_mojom_traits.h

@@ -107,6 +107,11 @@ class StructTraits<tracing::mojom::PerfettoBuiltinDataSourceDataView,
     return src.disable_system_info();
   }
 
+  static bool disable_service_events(
+      const perfetto::TraceConfig::BuiltinDataSource& src) {
+    return src.disable_service_events();
+  }
+
   static bool Read(tracing::mojom::PerfettoBuiltinDataSourceDataView data,
                    perfetto::TraceConfig::BuiltinDataSource* out);
 };