Restart fullscreen video playback when switching back from background

content/browser/media/android/browser_media_player_manager.cc

Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 2273b5cdc23e4ad81c7bcd4393ebe896a3d8d5e0..7be26b07fbf0ce8dd543dbcd60600a275301ed02 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -140,10 +140,6 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
 void BrowserMediaPlayerManager::FullscreenPlayerPlay() {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player) {
-    if (fullscreen_player_is_released_) {
-      video_view_->OpenVideo();
-      fullscreen_player_is_released_ = false;
-    }
     player->Start();
     Send(new MediaPlayerMsg_DidMediaPlayerPlay(
         routing_id(), fullscreen_player_id_));
@@ -162,8 +158,8 @@ void BrowserMediaPlayerManager::FullscreenPlayerPause() {
 void BrowserMediaPlayerManager::FullscreenPlayerSeek(int msec) {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player) {
-    // TODO(kbalazs): if |fullscreen_player_is_released_| is true
-    // at this point, player->GetCurrentTime() will be wrong until
+    // TODO(kbalazs): if the fullscreen player has been Release()-d and
+    // not restarted yet, player->GetCurrentTime() will be wrong until
     // FullscreenPlayerPlay (http://crbug.com/322798).
     OnSeekRequest(fullscreen_player_id_,
                   base::TimeDelta::FromMilliseconds(msec));
@@ -450,10 +446,7 @@ void BrowserMediaPlayerManager::OnEnterFullscreen(int player_id) {
     return;
   }
 
-  if (video_view_.get()) {
-    fullscreen_player_id_ = player_id;
-    video_view_->OpenVideo();
-  } else if (!ContentVideoView::HasContentVideoView()) {
+  if (!ContentVideoView::HasContentVideoView()) {
     // In Android WebView, two ContentViewCores could both try to enter
     // fullscreen video, we just ignore the second one.
     fullscreen_player_id_ = player_id;
@@ -469,7 +462,8 @@ void BrowserMediaPlayerManager::OnExitFullscreen(int player_id) {
     MediaPlayerAndroid* player = GetPlayer(player_id);
     if (player)
       player->SetVideoSurface(gfx::ScopedJavaSurface());
-    video_view_->OnExitFullscreen();
+    video_view_.reset();
+    fullscreen_player_id_ = -1;
   }
 }
 
@@ -525,8 +519,6 @@ void BrowserMediaPlayerManager::OnReleaseResources(int player_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->Release();
-  if (player_id == fullscreen_player_id_)
-    fullscreen_player_is_released_ = true;
 
 #if defined(GOOGLE_TV)
   WebContentsViewAndroid* view =