Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc

Index: content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
index 7c3c806f4839acf0f7a5ad91ed04b7dddca06948..490c45e41f03d1376a347efa715027d79d0ea917 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
@@ -61,12 +61,12 @@ GpuMemoryBufferFactorySurfaceTexture::CreateGpuMemoryBuffer(
     return gfx::GpuMemoryBufferHandle();
 
   SurfaceTextureManager::GetInstance()->RegisterSurfaceTexture(
-      id, client_id, surface_texture.get());
+      id.id, client_id, surface_texture.get());
 
   {
     base::AutoLock lock(surface_textures_lock_);
 
-    SurfaceTextureMapKey key(id, client_id);
+    SurfaceTextureMapKey key(id.id, client_id);
     DCHECK(surface_textures_.find(key) == surface_textures_.end());
     surface_textures_[key] = surface_texture;
   }
@@ -83,12 +83,13 @@ void GpuMemoryBufferFactorySurfaceTexture::DestroyGpuMemoryBuffer(
   {
     base::AutoLock lock(surface_textures_lock_);
 
-    SurfaceTextureMapKey key(id, client_id);
+    SurfaceTextureMapKey key(id.id, client_id);
     DCHECK(surface_textures_.find(key) != surface_textures_.end());
     surface_textures_.erase(key);
   }
 
-  SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(id, client_id);
+  SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(id.id,
+                                                                 client_id);
 }
 
 gpu::ImageFactory* GpuMemoryBufferFactorySurfaceTexture::AsImageFactory() {
@@ -106,7 +107,7 @@ GpuMemoryBufferFactorySurfaceTexture::CreateImageForGpuMemoryBuffer(
 
   DCHECK_EQ(handle.type, gfx::SURFACE_TEXTURE_BUFFER);
 
-  SurfaceTextureMapKey key(handle.id, client_id);
+  SurfaceTextureMapKey key(handle.id.id, client_id);
   SurfaceTextureMap::iterator it = surface_textures_.find(key);
   if (it == surface_textures_.end())
     return scoped_refptr<gfx::GLImage>();