gpu: Associate all GpuMemoryBuffers with unique IDs.

content/app/android/child_process_service.cc

Index: content/app/android/child_process_service.cc
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index b45a053229cb0618238d771936c66ab47e180068..9d46e080c8222c3153f6a5f15cc58f26bfec15d4 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -68,12 +68,12 @@ class SurfaceTextureManagerImpl : public SurfaceTextureManager,
     Java_ChildProcessService_destroySurfaceTextureSurface(
         env, service_.obj(), surface_texture_id, client_id);
   }
-  virtual gfx::AcceleratedWidget AcquireNativeWidget(int surface_texture_id,
-                                                     int client_id) override {
+  virtual gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
+      int surface_texture_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     gfx::ScopedJavaSurface surface(
-        Java_ChildProcessService_getSurfaceTextureSurface(
-            env, service_.obj(), surface_texture_id, client_id));
+        Java_ChildProcessService_getSurfaceTextureSurface(env, service_.obj(),
+                                                          surface_texture_id));
 
     if (surface.j_surface().is_null())
       return NULL;