Fix an issue that an invalid surface could be passed to MediaPlayerBridge

media/base/android/media_player_bridge.cc

Index: media/base/android/media_player_bridge.cc
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index e043a7878df7efa29149b60a6842fc3d4831c21d..fd5c9eceee822a66ce83ad2d208b9da16bd380ab 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -109,17 +109,16 @@ void MediaPlayerBridge::SetDuration(base::TimeDelta duration) {
 }
 
 void MediaPlayerBridge::SetVideoSurface(gfx::ScopedJavaSurface surface) {
-  if (j_media_player_bridge_.is_null()) {
-    if (!surface.IsEmpty())
-      surface_ =  surface.Pass();
+  surface_ =  surface.IsValid() ? surface.Pass() : gfx::ScopedJavaSurface();

[no sievers, 2015/10/08 23:00:27]

Should we just make ScopedJavaSurface::MoveFrom() work for null surfaces? Since
it works for scoped_ptr, for example, right?

Also, less verbose, 'surface_ = surface' should work, I think.

[qinmin, 2015/10/08 23:47:23]

with the move-only type, the right hand side has to have a .Pass().

+
+  if (j_media_player_bridge_.is_null())
     return;
-  }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   Java_MediaPlayerBridge_setSurface(
-      env, j_media_player_bridge_.obj(), surface.j_surface().obj());
+      env, j_media_player_bridge_.obj(), surface_.j_surface().obj());
 }
 
 void MediaPlayerBridge::Prepare() {