Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.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 "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 40 matching lines @@
   ANativeWindow_release(native_window_);
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImpl>
 GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     const DestructionCallback& callback) {
-  ANativeWindow* native_window = SurfaceTextureManager::GetInstance()->
-      AcquireNativeWidgetForSurfaceTexture(handle.id);
+  ANativeWindow* native_window =
+      SurfaceTextureManager::GetInstance()
+          ->AcquireNativeWidgetForSurfaceTexture(handle.id.id);
   if (!native_window)
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   ANativeWindow_setBuffersGeometry(
       native_window, size.width(), size.height(), WindowFormat(format));
 
   return make_scoped_ptr<GpuMemoryBufferImpl>(
       new GpuMemoryBufferImplSurfaceTexture(
           handle.id, size, format, callback, native_window));
 }
@@ skipping 36 matching lines @@
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content