Revert of Make TestRenderWidgetHostView::Show/Hide call through to RWHI

content/test/test_render_view_host.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/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 42 matching lines @@
   params->searchable_form_encoding = std::string();
   params->did_create_new_entry = did_create_new_entry;
   params->gesture = NavigationGestureUser;
   params->was_within_same_page = false;
   params->method = "GET";
   params->page_state = PageState::CreateFromURL(url);
 }
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
+      is_showing_(false),
       is_occluded_(false),
       did_swap_compositor_frame_(false) {
 #if defined(OS_ANDROID)
   // Not all tests initialize or need a context provider factory.
   if (ContextProviderFactoryImpl::GetInstance()) {
     frame_sink_id_ = AllocateFrameSinkId();
     GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   }
 #else
   // Not all tests initialize or need an image transport factory.
@@ skipping 41 matching lines @@
 
 bool TestRenderWidgetHostView::HasFocus() const {
   return true;
 }
 
 bool TestRenderWidgetHostView::IsSurfaceAvailableForCopy() const {
   return true;
 }
 
 void TestRenderWidgetHostView::Show() {
+  is_showing_ = true;
   is_occluded_ = false;
-  if (rwh_->is_hidden())
-    rwh_->WasShown(ui::LatencyInfo());
 }
 
 void TestRenderWidgetHostView::Hide() {
-  if (!rwh_->is_hidden())
-    rwh_->WasHidden();
+  is_showing_ = false;
 }
 
 bool TestRenderWidgetHostView::IsShowing() {
-  return !rwh_->is_hidden();
+  return is_showing_;
 }
 
 void TestRenderWidgetHostView::WasUnOccluded() {
   is_occluded_ = false;
 }
 
 void TestRenderWidgetHostView::WasOccluded() {
   is_occluded_ = true;
 }
 
@@ skipping 119 matching lines @@
   if (main_frame)
     static_cast<RenderFrameHostImpl*>(main_frame)->SetRenderFrameCreated(true);
 
   return true;
 }
 
 MockRenderProcessHost* TestRenderViewHost::GetProcess() const {
   return static_cast<MockRenderProcessHost*>(RenderViewHostImpl::GetProcess());
 }
 
+void TestRenderViewHost::SimulateWasHidden() {
+  GetWidget()->WasHidden();
+}
+
+void TestRenderViewHost::SimulateWasShown() {
+  GetWidget()->WasShown(ui::LatencyInfo());
+}
+
 WebPreferences TestRenderViewHost::TestComputeWebkitPrefs() {
   return ComputeWebkitPrefs();
 }
 
 void TestRenderViewHost::OnWebkitPreferencesChanged() {
   RenderViewHostImpl::OnWebkitPreferencesChanged();
   if (webkit_preferences_changed_counter_)
     ++*webkit_preferences_changed_counter_;
 }
 
@@ skipping 38 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content