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

content/browser/android/content_view_core_impl.cc

 // Copyright 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_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
-#include "content/browser/android/content_video_view.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
@@ skipping 392 matching lines @@
 void ContentViewCoreImpl::OnHide(JNIEnv* env, jobject obj) {
   Hide();
 }
 
 void ContentViewCoreImpl::OnShow(JNIEnv* env, jobject obj) {
   Show();
 }
 
 void ContentViewCoreImpl::Show() {
   GetWebContents()->WasShown();
-  ResumeVideo();
 }
 
 void ContentViewCoreImpl::Hide() {
   GetWebContents()->WasHidden();
   PauseVideo();
 }
 
 void ContentViewCoreImpl::PauseVideo() {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   if (host)
     host->Send(new ViewMsg_PauseVideo(host->GetRoutingID()));
-  if (ContentVideoView::GetInstance())
-    ContentVideoView::GetInstance()->SuspendFullscreen();
-}
-
-void ContentViewCoreImpl::ResumeVideo() {
-  if (ContentVideoView::GetInstance())
-    ContentVideoView::GetInstance()->ResumeFullscreenIfSuspended();
 }
 
 void ContentViewCoreImpl::PauseOrResumeGeolocation(bool should_pause) {
   geolocation_needs_pause_ = should_pause;
   RenderViewHostImpl* rvh =
       static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
   if (rvh) {
     scoped_refptr<GeolocationDispatcherHost> geolocation_dispatcher =
         static_cast<RenderProcessHostImpl*>(
             web_contents_->GetRenderProcessHost())->
@@ skipping 1408 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content