Update GpuSurfaceTracker to include Android surfaces.

content/browser/media/android/browser_surface_view_manager.cc

 // Copyright 2016 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/media/android/browser_surface_view_manager.h"
 
 #include "base/android/build_info.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
@@ skipping 23 matching lines @@
     : render_frame_host_(render_frame_host),
       surface_id_(media::SurfaceManager::kNoSurfaceID) {}
 
 BrowserSurfaceViewManager::~BrowserSurfaceViewManager() {}
 
 void BrowserSurfaceViewManager::SetVideoSurface(gl::ScopedJavaSurface surface) {
   TRACE_EVENT0("media", "BrowserSurfaceViewManager::SetVideoSurface");
   if (surface.IsEmpty()) {
     DCHECK_NE(surface_id_, media::SurfaceManager::kNoSurfaceID);
     gpu::GpuSurfaceTracker::Get()->RemoveSurface(surface_id_);
-    gpu::GpuSurfaceTracker::Get()->UnregisterViewSurface(surface_id_);
     SendDestroyingVideoSurface(surface_id_);
     surface_id_ = media::SurfaceManager::kNoSurfaceID;
   } else {
     // We just use the surface tracker to allocate a surface id for us. The
     // lookup will go through the Android specific path and get the java
     // surface directly, so there's no need to add a valid native widget here.
     surface_id_ = gpu::GpuSurfaceTracker::Get()->AddSurfaceForNativeWidget(
-        gfx::kNullAcceleratedWidget);
-    gpu::GpuSurfaceTracker::GetInstance()->RegisterViewSurface(
-        surface_id_, surface.j_surface().obj());
+        gpu::GpuSurfaceTracker::SurfaceRecord(gfx::kNullAcceleratedWidget,
+                                              surface.j_surface().obj()));
     SendSurfaceID(surface_id_);
   }
 }
 
 void BrowserSurfaceViewManager::DidExitFullscreen(bool release_media_player) {
   DVLOG(3) << __func__;
   content_video_view_.reset();
 }
 
 void BrowserSurfaceViewManager::OnCreateFullscreenSurface(
@@ skipping 59 matching lines @@
           BrowserThread::IO, FROM_HERE,
           base::Bind(&SendDestroyingVideoSurfaceOnIO, surface_id,
                      base::Bind(&base::WaitableEvent::Signal,
                                 base::Unretained(&waiter))))) {
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     waiter.Wait();
   }
 }
 
 }  // namespace content