Change format of data emitted in MemoryDumpProvider.

mojo/edk/system/handle_table.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/handle_table.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 163 matching lines @@
   handle_count[Dispatcher::Type::PLATFORM_HANDLE];
 
   // Count the number of each dispatcher type.
   {
     base::AutoLock lock(GetLock());
     for (const auto& entry : handles_) {
       ++handle_count[entry.second.dispatcher->GetType()];
     }
   }
 
-  base::trace_event::MemoryAllocatorDump* outer_dump =
-      pmd->CreateAllocatorDump("mojo");
+  pmd->CreateAllocatorDump("mojo");
   for (const auto& entry : handle_count) {
-    outer_dump->AddScalar(GetNameForDispatcherType(entry.first),
-                          base::trace_event::MemoryAllocatorDump::kUnitsObjects,
-                          entry.second);
+    base::trace_event::MemoryAllocatorDump* inner_dump =
+        pmd->CreateAllocatorDump(std::string("mojo/") +
+                                 GetNameForDispatcherType(entry.first));
+    inner_dump->AddScalar(
+        base::trace_event::MemoryAllocatorDump::kNameObjectCount,
+        base::trace_event::MemoryAllocatorDump::kUnitsObjects, entry.second);
   }
 
   return true;
 }
 
 HandleTable::Entry::Entry() {}
 
 HandleTable::Entry::Entry(scoped_refptr<Dispatcher> dispatcher)
     : dispatcher(std::move(dispatcher)) {}
 
 HandleTable::Entry::Entry(const Entry& other) = default;
 
 HandleTable::Entry::~Entry() {}
 
 }  // namespace edk
 }  // namespace mojo