Send the video surface destruction message on all Android versions

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 24 matching lines @@
       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_);
-    SendDestroyingVideoSurfaceIfRequired(surface_id_);
+    SendDestroyingVideoSurface(surface_id_);
     surface_id_ = media::SurfaceManager::kNoSurfaceID;
   } else {
-    // We mainly use the surface tracker to allocate a surface id for us. The
+    // 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());
     SendSurfaceID(surface_id_);
   }
 }
 
 void BrowserSurfaceViewManager::DidExitFullscreen(bool release_media_player) {
-  DVLOG(3) << __FUNCTION__;
+  DVLOG(3) << __func__;
   content_video_view_.reset();
 }
 
 void BrowserSurfaceViewManager::OnCreateFullscreenSurface(
     const gfx::Size& video_natural_size) {
   // It's valid to get this call if we already own the fullscreen view. We just
   // return the existing surface id.
   if (content_video_view_) {
     // Send the surface now if we have it. Otherwise it will be returned by
     // |SetVideoSurface|.
@@ skipping 26 matching lines @@
   if (content_video_view_)
     content_video_view_->OnVideoSizeChanged(size.width(), size.height());
 }
 
 bool BrowserSurfaceViewManager::SendSurfaceID(int surface_id) {
   return render_frame_host_->Send(
       new SurfaceViewManagerMsg_FullscreenSurfaceCreated(
           render_frame_host_->GetRoutingID(), surface_id));
 }
 
-void BrowserSurfaceViewManager::SendDestroyingVideoSurfaceIfRequired(
-    int surface_id) {
-  // Only send the surface destruction message on JB, where not doing it can
-  // cause a crash.
-  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 18)
-    return;
-
+void BrowserSurfaceViewManager::SendDestroyingVideoSurface(int surface_id) {
   base::WaitableEvent waiter(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   // Unretained is okay because we're waiting on the callback.
   if (BrowserThread::PostTask(
           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