Use JNI UnguessableToken in ScopedSurfaceRequest

content/app/android/child_process_service_impl.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_impl.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/memory_pressure_listener_android.h"
+#include "base/android/unguessable_token_android.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/posix/global_descriptors.h"
 #include "base/unguessable_token.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/common/content_descriptors.h"
 #include "gpu/ipc/common/android/scoped_surface_request_conduit.h"
 #include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "gpu/ipc/common/gpu_surface_lookup.h"
@@ skipping 80 matching lines @@
   }
 
   // Overriden from ScopedSurfaceRequestConduit:
   void ForwardSurfaceTextureForSurfaceRequest(
       const base::UnguessableToken& request_token,
       const gl::SurfaceTexture* surface_texture) override {
     JNIEnv* env = base::android::AttachCurrentThread();
 
     content::
         Java_ChildProcessServiceImpl_forwardSurfaceTextureForSurfaceRequest(
-            env, service_impl_, request_token.GetHighForSerialization(),
-            request_token.GetLowForSerialization(),
+            env, service_impl_,
+            base::android::UnguessableTokenAndroid::Create(env, request_token),
             surface_texture->j_surface_texture());
   }
 
   // Overridden from GpuSurfaceLookup:
   gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     gl::ScopedJavaSurface surface(
         content::Java_ChildProcessServiceImpl_getViewSurface(env, service_impl_,
                                                              surface_id));
 
@@ skipping 67 matching lines @@
 
 bool RegisterChildProcessServiceImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content