Update GpuSurfaceTracker to include Android surfaces.

chrome/browser/android/vr_shell/mailbox_to_surface_bridge.cc

 // Copyright 2017 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 "chrome/browser/android/vr_shell/mailbox_to_surface_bridge.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 123 matching lines @@
 }  // namespace
 
 namespace vr_shell {
 
 MailboxToSurfaceBridge::MailboxToSurfaceBridge() : weak_ptr_factory_(this) {}
 
 MailboxToSurfaceBridge::~MailboxToSurfaceBridge() {
   if (surface_handle_) {
     // Unregister from the surface tracker to avoid a resource leak.
     gpu::GpuSurfaceTracker* tracker = gpu::GpuSurfaceTracker::Get();
-    tracker->UnregisterViewSurface(surface_handle_);
+    tracker->RemoveSurface(surface_handle_);
   }
   DestroyContext();
 }
 
 void MailboxToSurfaceBridge::OnContextAvailable(
     scoped_refptr<cc::ContextProvider> provider) {
   // Must save a reference to the ContextProvider to keep it alive,
   // otherwise the GL context created from it becomes invalid.
   context_provider_ = std::move(provider);
 
@@ skipping 10 matching lines @@
   }
   InitializeRenderer();
 }
 
 void MailboxToSurfaceBridge::CreateSurface(
     gl::SurfaceTexture* surface_texture) {
   ANativeWindow* window = surface_texture->CreateSurface();
   gpu::GpuSurfaceTracker* tracker = gpu::GpuSurfaceTracker::Get();
   ANativeWindow_acquire(window);
   // Skip ANativeWindow_setBuffersGeometry, the default size appears to work.
-  surface_handle_ = tracker->AddSurfaceForNativeWidget(window);
-
   auto surface = base::MakeUnique<gl::ScopedJavaSurface>(surface_texture);
-  tracker->RegisterViewSurface(surface_handle_, surface->j_surface().obj());
+  surface_handle_ =
+      tracker->AddSurfaceForNativeWidget(gpu::GpuSurfaceTracker::SurfaceRecord(
+          window, surface->j_surface().obj()));
   // Unregistering happens in the destructor.
   ANativeWindow_release(window);
 
   // Our attributes must be compatible with the shared offscreen
   // surface used by virtualized contexts, otherwise mailbox
   // synchronization doesn't work properly - it assumes a shared
   // underlying GL context. See GetCompositorContextAttributes
   // in content/browser/renderer_host/compositor_impl_android.cc
   // and crbug.com/699330.
 
@@ skipping 148 matching lines @@
   // GL_NEAREST.
   gl_->BindTexture(GL_TEXTURE_2D, texture_handle);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   gl_->DrawArrays(GL_TRIANGLE_FAN, 0, 4);
 }
 
 }  // namespace vr_shell