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

content/test/test_render_view_host.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 36 matching lines @@
 // Utility function to initialize FrameHostMsg_DidCommitProvisionalLoad_Params
 // with given parameters.
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int nav_entry_id,
                         bool did_create_new_entry,
                         const GURL& url,
                         ui::PageTransition transition_type);
 
 // TestRenderWidgetHostView ----------------------------------------------------
 
-// Subclass the RenderViewHost's view.
+// Subclass the RenderViewHost's view so that we can call Show(), etc.,
+// without having side-effects.
 class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
  public:
   explicit TestRenderWidgetHostView(RenderWidgetHost* rwh);
   ~TestRenderWidgetHostView() override;
 
   // RenderWidgetHostView implementation.
   void InitAsChild(gfx::NativeView parent_view) override {}
   RenderWidgetHost* GetRenderWidgetHost() const override;
   void SetSize(const gfx::Size& size) override {}
   void SetBounds(const gfx::Rect& rect) override {}
@@ skipping 40 matching lines @@
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
       const base::Callback<void(const gfx::Rect&, bool)>& callback) override;
   bool CanCopyToVideoFrame() const override;
   bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
   gfx::Rect GetBoundsInRootWindow() override;
   bool LockMouse() override;
   void UnlockMouse() override;
   cc::FrameSinkId GetFrameSinkId() override;
 
+  bool is_showing() const { return is_showing_; }
   bool is_occluded() const { return is_occluded_; }
   bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; }
 
  protected:
   RenderWidgetHostImpl* rwh_;
   cc::FrameSinkId frame_sink_id_;
 
  private:
+  bool is_showing_;
   bool is_occluded_;
   bool did_swap_compositor_frame_;
   ui::DummyTextInputClient text_input_client_;
 };
 
 #if defined(COMPILER_MSVC)
 // See comment for same warning on RenderViewHostImpl.
 #pragma warning(push)
 #pragma warning(disable: 4250)
 #endif
@@ skipping 40 matching lines @@
   TestRenderViewHost(SiteInstance* instance,
                      std::unique_ptr<RenderWidgetHostImpl> widget,
                      RenderViewHostDelegate* delegate,
                      int32_t main_frame_routing_id,
                      bool swapped_out);
   ~TestRenderViewHost() override;
 
   // RenderViewHostTester implementation.  Note that CreateRenderView
   // is not specified since it is synonymous with the one from
   // RenderViewHostImpl, see below.
+  void SimulateWasHidden() override;
+  void SimulateWasShown() override;
   WebPreferences TestComputeWebkitPrefs() override;
 
   void TestOnUpdateStateWithFile(const base::FilePath& file_path);
 
   void TestOnStartDragging(const DropData& drop_data);
 
   // If set, *delete_counter is incremented when this object destructs.
   void set_delete_counter(int* delete_counter) {
     delete_counter_ = delete_counter;
   }
@@ skipping 98 matching lines @@
  private:
   typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_