Add count also in memory dump events

The counts in the memory dump cannot be easily correlated to trace
events. So just add the info to the event too.

Change-Id: I2a9a94aa8ce63320fd1b088c975bd255c9c0c7cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1566215Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: ssid <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660233}

ipc/ipc_mojo_bootstrap.cc

@@ -1035,9 +1035,10 @@ bool ControllerMemoryDumpProvider::OnMemoryDump(
       // TODO(ssid): Memory dumps currently do not support adding string
       // arguments in background dumps. So, add this value as a trace event for
       // now.
-      TRACE_EVENT1(base::trace_event::MemoryDumpManager::kTraceCategory,
+      TRACE_EVENT2(base::trace_event::MemoryDumpManager::kTraceCategory,
                    "ControllerMemoryDumpProvider::OnMemoryDump",
-                   "top_queued_message_tag", info.profiler_tag);
+                   "top_queued_message_tag", info.profiler_tag,
+                   "count", count);
     }
   }
 

services/tracing/public/cpp/trace_event_args_whitelist.cc

@@ -30,7 +30,7 @@ const char* const kGetFallbackFontsAllowedArgs[] = {"script", nullptr};
 const char* const kGPUAllowedArgs[] = {nullptr};
 const char* const kInputLatencyAllowedArgs[] = {"data", nullptr};
 const char* const kMemoryDumpAllowedArgs[] = {"dumps", "top_queued_message_tag",
-                                              nullptr};
+                                              "count", nullptr};
 const char* const kRendererHostAllowedArgs[] = {
     "class",           "line", "should_background", "has_pending_views",
     "bytes_allocated", nullptr};