Log both GL and cpu-side memory in GLImage*Memory

ui/gl/gl_image_shared_memory.cc

Index: ui/gl/gl_image_shared_memory.cc
diff --git a/ui/gl/gl_image_shared_memory.cc b/ui/gl/gl_image_shared_memory.cc
index cb22c7562439363e334692f9c861057039e1c5e2..33ba4d161aba82b7f95f085e27f75c20e5d26f0f 100644
--- a/ui/gl/gl_image_shared_memory.cc
+++ b/ui/gl/gl_image_shared_memory.cc
@@ -93,8 +93,10 @@ void GLImageSharedMemory::OnMemoryDump(
     DCHECK(result);
   }
 
+  // Dump under "/shared_memory", as the base class may also dump to
+  // "/texture_memory".
   base::trace_event::MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(dump_name);
+      pmd->CreateAllocatorDump(dump_name + "/private_memory");
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size_in_bytes));
@@ -103,6 +105,9 @@ void GLImageSharedMemory::OnMemoryDump(
                                                         shared_memory_id_);
   pmd->CreateSharedGlobalAllocatorDump(guid);
   pmd->AddOwnershipEdge(dump->guid(), guid);
+
+  // Also dump the base class's texture memory.
+  GLImageMemory::OnMemoryDump(pmd, process_tracing_id, dump_name);
 }
 
 }  // namespace gfx