Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

cc/resources/resource_provider.cc

 // Copyright 2012 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/containers/hash_tables.h"
+#include "base/memory/generic_shared_memory_id.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_math.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/resources/platform_color.h"
@@ skipping 1986 matching lines @@
         resource.size, resource.format);
     dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                     base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                     static_cast<uint64_t>(total_bytes));
 
     // Resources which are shared across processes require a shared GUID to
     // prevent double counting the memory. We currently support shared GUIDs for
     // GpuMemoryBuffer, SharedBitmap, and GL backed resources.
     base::trace_event::MemoryAllocatorDumpGuid guid;
     if (resource.gpu_memory_buffer) {
-      guid = gfx::GetGpuMemoryBufferGUIDForTracing(
+      guid = base::GetGenericSharedMemoryGUIDForTracing(
           tracing_process_id, resource.gpu_memory_buffer->GetHandle().id);
     } else if (resource.shared_bitmap) {
       guid = GetSharedBitmapGUIDForTracing(resource.shared_bitmap->id());
     } else if (resource.gl_id && resource.allocated) {
       guid =
           gfx::GetGLTextureGUIDForTracing(tracing_process_id, resource.gl_id);
     }
 
     if (!guid.empty()) {
       const int kImportance = 2;
       pmd->CreateSharedGlobalAllocatorDump(guid);
       pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
     }
   }
 
   return true;
 }
 
 }  // namespace cc