gpu: Associate all GpuMemoryBuffers with unique IDs.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index affbeb7e67d288760cd6412ec86920f1e362a4ec..c46e297c446912b98b627ac02ba47a8e6b0a1847 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -545,18 +545,14 @@ public class ChildProcessLauncher {
             }
 
             @Override
-            public SurfaceWrapper getSurfaceTextureSurface(int surfaceTextureId, int clientId) {
+            public SurfaceWrapper getSurfaceTextureSurface(int surfaceTextureId) {
                 if (callbackType != CALLBACK_FOR_RENDERER_PROCESS) {
                     Log.e(TAG, "Illegal callback for non-renderer process.");
                     return null;
                 }
 
-                if (clientId != childProcessId) {
-                    Log.e(TAG, "Illegal secondaryId for renderer process.");
-                    return null;
-                }
-
-                return ChildProcessLauncher.getSurfaceTextureSurface(surfaceTextureId, clientId);
+                return ChildProcessLauncher.getSurfaceTextureSurface(surfaceTextureId,
+                        childProcessId);
             }
         };
     }