Partial revert of "Restart fullscreen video playback when switching back from background"

content/browser/android/content_video_view.cc

 // Copyright (c) 2012 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/android/content_video_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/android/content_view_core_impl.h"
@@ skipping 27 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 ContentVideoView* ContentVideoView::GetInstance() {
   return g_content_video_view;
 }
 
 ContentVideoView::ContentVideoView(
     BrowserMediaPlayerManager* manager)
     : manager_(manager),
-      fullscreen_state_(ENTERED),
       weak_factory_(this) {
   DCHECK(!g_content_video_view);
   j_content_video_view_ = CreateJavaObject();
   g_content_video_view = this;
   CreatePowerSaveBlocker();
 }
 
 ContentVideoView::~ContentVideoView() {
   DCHECK(g_content_video_view);
   DestroyContentVideoView(true);
@@ skipping 105 matching lines @@
 }
 
 void ContentVideoView::Pause(JNIEnv*, jobject obj) {
   power_save_blocker_.reset();
   manager_->FullscreenPlayerPause();
 }
 
 void ContentVideoView::ExitFullscreen(
     JNIEnv*, jobject, jboolean release_media_player) {
   power_save_blocker_.reset();
-  if (fullscreen_state_ == SUSPENDED)
-    return;
   j_content_video_view_.reset();
   manager_->ExitFullscreen(release_media_player);
 }
 
-void ContentVideoView::SuspendFullscreen() {
-  power_save_blocker_.reset();
-  if (fullscreen_state_ != ENTERED)
-    return;
-  fullscreen_state_ = SUSPENDED;
-  DestroyContentVideoView(false);
-  manager_->SuspendFullscreen();
-}
-
-void ContentVideoView::ResumeFullscreenIfSuspended() {
-  if (fullscreen_state_ != SUSPENDED)
-    return;
-  JNIEnv* env = AttachCurrentThread();
-  DCHECK(!GetJavaObject(env).obj());
-  fullscreen_state_ = RESUME;
-  j_content_video_view_ = CreateJavaObject();
-  CreatePowerSaveBlocker();
-}
-
 void ContentVideoView::SetSurface(JNIEnv* env, jobject obj,
                                   jobject surface) {
-  gfx::ScopedJavaSurface scoped_surface =
-      gfx::ScopedJavaSurface::AcquireExternalSurface(surface);
-  if (fullscreen_state_ == RESUME) {
-    DCHECK(surface);
-    manager_->ResumeFullscreen(scoped_surface.Pass());
-    fullscreen_state_ = ENTERED;
-  } else {
-    manager_->SetVideoSurface(scoped_surface.Pass());
-  }
+  manager_->SetVideoSurface(
+      gfx::ScopedJavaSurface::AcquireExternalSurface(surface));
 }
 
 void ContentVideoView::RequestMediaMetadata(JNIEnv* env, jobject obj) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ContentVideoView::UpdateMediaMetadata,
                  weak_factory_.GetWeakPtr()));
 }
 
 ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
@@ skipping 40 matching lines @@
 void ContentVideoView::DestroyContentVideoView(bool native_view_destroyed) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_destroyContentVideoView(env,
         content_video_view.obj(), native_view_destroyed);
     j_content_video_view_.reset();
   }
 }
 }  // namespace content