gpu: Associate all GpuMemoryBuffers with unique IDs.

content/app/android/child_process_service.cc

 // Copyright (c) 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 "content/app/android/child_process_service.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
@@ skipping 50 matching lines @@
         surface_texture_id,
         client_id,
         surface_texture->j_surface_texture().obj());
   }
   virtual void UnregisterSurfaceTexture(int surface_texture_id,
                                         int client_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     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;
 
     // Note: This ensures that any local references used by
     // ANativeWindow_fromSurface are released immediately. This is needed as a
     // workaround for https://code.google.com/p/android/issues/detail?id=68174
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     ANativeWindow* native_window =
         ANativeWindow_fromSurface(env, surface.j_surface().obj());
@@ skipping 98 matching lines @@
 
 bool RegisterChildProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, jobject obj) {
   ChildThread::ShutdownThread();
 }
 
 }  // namespace content