Rolled Perfetto and made the integration work with a minimal set of Chrome-specific protos.

R=primiano@chromium.org
BUG=837758

Change-Id: I2f55f7f4b6ea2f49b7168b2d26ac1b279ead0c79
Reviewed-on: https://chromium-review.googlesource.com/1038155
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Reviewed-by: Primiano Tucci <primiano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555391}

DEPS

@@ -860,7 +860,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' +  'e62bd2ba4fb9e814d832cc313f9181b998cf7144',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' +  '66d57768881fc6474a43b1b3903b9ecfbdcebf03',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + 'ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78',

services/tracing/BUILD.gn

@@ -41,9 +41,8 @@ source_set("lib") {
     ]
 
     deps = [
-      "//third_party/perfetto/protos/perfetto/trace:lite",
       "//third_party/perfetto/protos/perfetto/trace:zero",
-      "//third_party/perfetto/protos/perfetto/trace/chrome:lite",
+      "//third_party/perfetto/protos/perfetto/trace/chrome:minimal_complete_lite",
       "//third_party/perfetto/protos/perfetto/trace/chrome:zero",
     ]
 

services/tracing/perfetto/json_trace_exporter.cc

@@ -14,7 +14,7 @@
 #include "third_party/perfetto/include/perfetto/tracing/core/trace_config.h"
 #include "third_party/perfetto/include/perfetto/tracing/core/trace_packet.h"
 #include "third_party/perfetto/protos/perfetto/trace/chrome/chrome_trace_event.pbzero.h"
-#include "third_party/perfetto/protos/perfetto/trace/trace_packet.pb.h"
+#include "third_party/perfetto/protos/perfetto/trace/chrome/chrome_trace_packet.pb.h"
 
 namespace {
 
@@ -164,7 +164,7 @@ void JSONTraceExporter::OnTraceData(std::vector<perfetto::TracePacket> packets,
   }
 
   for (auto& encoded_packet : packets) {
-    perfetto::protos::TracePacket packet;
+    perfetto::protos::ChromeTracePacket packet;
     bool decoded = encoded_packet.Decode(&packet);
     DCHECK(decoded);
 

services/tracing/public/cpp/BUILD.gn

@@ -35,10 +35,8 @@ component("cpp") {
     ]
 
     deps = [
-      # TODO(oysteine): Add a Perfetto build target which contains
-      # only the top-level proto to avoid pulling in unused messages.
       "//third_party/perfetto/protos/perfetto/trace:zero",
-      "//third_party/perfetto/protos/perfetto/trace/chrome:lite",
+      "//third_party/perfetto/protos/perfetto/trace/chrome:minimal_complete_lite",
       "//third_party/perfetto/protos/perfetto/trace/chrome:zero",
     ]