Android Java Surfaces can now be looked up via GpuSurfaceTracker

content/browser/gpu/gpu_surface_tracker.cc

Index: content/browser/gpu/gpu_surface_tracker.cc
diff --git a/content/browser/gpu/gpu_surface_tracker.cc b/content/browser/gpu/gpu_surface_tracker.cc
index 765299900101ef65cc63231ff9976a8dd9f56d5d..60aed74c507ce83e642025a5208a86607c843034 100644
--- a/content/browser/gpu/gpu_surface_tracker.cc
+++ b/content/browser/gpu/gpu_surface_tracker.cc
@@ -9,6 +9,8 @@
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
+#include "content/browser/android/child_process_launcher_android.h"
+#include "ui/gl/android/scoped_java_surface.h"
 #endif  // defined(OS_ANDROID)
 
 namespace content {
@@ -74,6 +76,12 @@ gfx::AcceleratedWidget GpuSurfaceTracker::AcquireNativeWidget(int surface_id) {
   return it->second;
 }
 
+#if defined(OS_ANDROID)
+gfx::ScopedJavaSurface GpuSurfaceTracker::AcquireJavaSurface(int surface_id) {
+  return GetViewSurface(surface_id);
+}
+#endif
+
 std::size_t GpuSurfaceTracker::GetSurfaceCount() {
   base::AutoLock lock(lock_);
   return surface_map_.size();