Roll perfetto manually. Fix Chrome to match updated proto.

Change-Id: I5756149824d6cbdc2a91a7768607ef806fb52c6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730908Reviewed-by: Eric Seckler <eseckler@chromium.org>
Commit-Queue: Florian Mayer <fmayer@google.com>
Auto-Submit: Florian Mayer <fmayer@google.com>
Cr-Commit-Position: refs/heads/master@{#683243}

DEPS

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

services/tracing/perfetto/track_event_json_exporter.cc

@@ -639,15 +639,22 @@ void TrackEventJSONExporter::HandleStreamingProfilePacket(
 
 void TrackEventJSONExporter::HandleProfiledFrameSymbols(
     const perfetto::protos::ProfiledFrameSymbols& frame_symbols) {
-  auto iter =
-      unordered_state_data_[current_state_->trusted_packet_sequence_id]
-          .interned_profiled_frame_.insert(std::make_pair(
-              frame_symbols.frame_iid(), frame_symbols.function_name_id()));
+  int64_t function_name_id = 0;
+  // Chrome never has more than one function for an address, so we can just
+  // take the first one.
+  if (!frame_symbols.function_name_id().empty()) {
+    DCHECK(frame_symbols.function_name_id().size() == 1);
+    function_name_id = frame_symbols.function_name_id()[0];
+  }
+
+  auto iter = unordered_state_data_[current_state_->trusted_packet_sequence_id]
+                  .interned_profiled_frame_.insert(std::make_pair(
+                      frame_symbols.frame_iid(), function_name_id));
   auto& frame_names =
       unordered_state_data_[current_state_->trusted_packet_sequence_id]
           .interned_frame_names_;
-  DCHECK(iter.second || frame_names[iter.first->second] ==
-                            frame_names[frame_symbols.function_name_id()]);
+  DCHECK(iter.second ||
+         frame_names[iter.first->second] == frame_names[function_name_id]);
 }
 
 void TrackEventJSONExporter::HandleDebugAnnotation(