Reorganize GUIDs for GPU memory buffers

cc/raster/staging_buffer_pool.cc

Index: cc/raster/staging_buffer_pool.cc
diff --git a/cc/raster/staging_buffer_pool.cc b/cc/raster/staging_buffer_pool.cc
index 6fa0fe03551d7604e93fdd6a5c89a2f502704a5e..8ae089ed7b9131597caf371bb84c513c1e025a12 100644
--- a/cc/raster/staging_buffer_pool.cc
+++ b/cc/raster/staging_buffer_pool.cc
@@ -114,8 +114,14 @@ void StagingBuffer::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
   const uint64_t tracing_process_id =
       base::trace_event::MemoryDumpManager::GetInstance()
           ->GetTracingProcessId();
-  MemoryAllocatorDumpGuid shared_buffer_guid =
-      gfx::GetGpuMemoryBufferGUIDForTracing(tracing_process_id, buffer_id);
+  MemoryAllocatorDumpGuid shared_buffer_guid;
+  if (gpu_memory_buffer->GetHandle().type == gfx::SHARED_MEMORY_BUFFER) {

[ericrk, 2017/04/14 19:49:39]

Why not use GetGUIDForTracing in this case?

[hajimehoshi, 2017/04/17 06:18:06]

Oops, I forgot to do this. Done.

+    shared_buffer_guid =
+        gfx::GetSharedMemoryGUIDForTracing(tracing_process_id, buffer_id);
+  } else {
+    shared_buffer_guid = gfx::GetGenericSharedGpuMemoryGUIDForTracing(
+        tracing_process_id, buffer_id);
+  }
   pmd->CreateSharedGlobalAllocatorDump(shared_buffer_guid);
 
   // By creating an edge with a higher |importance| (w.r.t. browser-side dumps)