Use JNI UnguessableToken in ScopedSurfaceRequest

content/browser/android/child_process_launcher_android.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/browser/android/child_process_launcher_android.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
+#include "base/android/unguessable_token_android.h"
 #include "base/logging.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/common/gpu_surface_tracker.h"
@@ skipping 163 matching lines @@
   if (jsurface.is_null())
     return;
 
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &SetSurfacePeer, jsurface, pid, primary_id, secondary_id));
 }
 
 void CompleteScopedSurfaceRequest(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz,
-                                  jlong request_token_high,
-                                  jlong request_token_low,
+                                  const JavaParamRef<jobject>& token,
                                   const JavaParamRef<jobject>& surface) {
-  if (request_token_high == 0 && request_token_low == 0) {
+  base::UnguessableToken requestToken =
+      base::android::UnguessableTokenAndroid::FromJavaUnguessableToken(env,
+                                                                       token);
+  if (!requestToken) {
     DLOG(ERROR) << "Received invalid surface request token.";
     return;
   }
 
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ScopedJavaGlobalRef<jobject> jsurface;
   jsurface.Reset(env, surface);
   ScopedSurfaceRequestManager::GetInstance()->FulfillScopedSurfaceRequest(
-      base::UnguessableToken::Deserialize(request_token_high,
-                                          request_token_low),
-      gl::ScopedJavaSurface(jsurface));
+      requestToken, gl::ScopedJavaSurface(jsurface));
 }
 
 void CreateSurfaceTextureSurface(int surface_texture_id,
                                  int client_id,
                                  gl::SurfaceTexture* surface_texture) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_createSurfaceTextureSurface(
       env, surface_texture_id, client_id, surface_texture->j_surface_texture());
 }
@@ skipping 26 matching lines @@
   gl::ScopedJavaSurface surface_view =
       gpu::GpuSurfaceTracker::GetInstance()->AcquireJavaSurface(surface_id);
   return base::android::ScopedJavaLocalRef<jobject>(surface_view.j_surface());
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content