Make TestRenderWidgetHostView::Show/Hide call through to RWHI

components/visitedlink/test/visitedlink_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <cstdio>
 #include <memory>
 #include <string>
@@ skipping 12 matching lines @@
 #include "base/time/time.h"
 #include "base/timer/mock_timer.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
 #include "components/visitedlink/browser/visitedlink_event_listener.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "components/visitedlink/common/visitedlink.mojom.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
@@ skipping 737 matching lines @@
   RenderViewHostTester::For(rvh())->CreateTestRenderView(
       base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, false);
 
   // Waiting complete rebuild the table.
   content::RunAllBlockingPoolTasksUntilIdle();
 
   // After rebuild table expect reset event.
   EXPECT_EQ(1, context()->reset_event_count());
 
   // Simulate tab becoming inactive.
-  RenderViewHostTester::For(rvh())->SimulateWasHidden();
+  web_contents()->GetRenderWidgetHostView()->Hide();
 
   // Add a few URLs.
   master()->AddURL(GURL("http://acidtests.org/"));
   master()->AddURL(GURL("http://google.com/"));
   master()->AddURL(GURL("http://chromium.org/"));
   ASSERT_TRUE(timer_->IsRunning());
   timer_->Fire();
   context()->WaitForNoUpdate();
 
   // We shouldn't have any events.
   EXPECT_EQ(0, context()->add_event_count());
   EXPECT_EQ(1, context()->reset_event_count());
 
   // Simulate the tab becoming active.
-  RenderViewHostTester::For(rvh())->SimulateWasShown();
+  web_contents()->GetRenderWidgetHostView()->Show();
   context()->WaitForUpdate();
 
   // We should now have 3 add events, still no reset events.
   EXPECT_EQ(1, context()->add_event_count());
   EXPECT_EQ(1, context()->reset_event_count());
 
   // Deactivate the tab again.
-  RenderViewHostTester::For(rvh())->SimulateWasHidden();
+  web_contents()->GetRenderWidgetHostView()->Hide();
 
   // Add a bunch of URLs (over 50) to exhaust the link event buffer.
   for (int i = 0; i < 100; i++)
     master()->AddURL(TestURL(i));
 
   ASSERT_TRUE(timer_->IsRunning());
   timer_->Fire();
   context()->WaitForNoUpdate();
 
   // Again, no change in events until tab is active.
   EXPECT_EQ(1, context()->add_event_count());
   EXPECT_EQ(1, context()->reset_event_count());
 
   // Activate the tab.
-  RenderViewHostTester::For(rvh())->SimulateWasShown();
+  web_contents()->GetRenderWidgetHostView()->Show();
   EXPECT_FALSE(timer_->IsRunning());
   context()->WaitForUpdate();
 
   // We should have only one more reset event.
   EXPECT_EQ(1, context()->add_event_count());
   EXPECT_EQ(2, context()->reset_event_count());
 }
 
 // Tests that VisitedLink ignores renderer process creation notification for a
 // different context.
@@ skipping 39 matching lines @@
   // Waiting complete loading the table.
   content::RunAllBlockingPoolTasksUntilIdle();
 
   context()->binding().FlushForTesting();
 
   // After load table expect completely reset event.
   EXPECT_EQ(1, context()->completely_reset_event_count());
 }
 
 }  // namespace visitedlink