Remove WebContents::Was{Hidden,Shown}() from the content public interface

chrome/browser/engagement/site_engagement_helper_unittest.cc

Index: chrome/browser/engagement/site_engagement_helper_unittest.cc
diff --git a/chrome/browser/engagement/site_engagement_helper_unittest.cc b/chrome/browser/engagement/site_engagement_helper_unittest.cc
index db00c5968deaafa506e3e8fd6276bcdd1004c011..724927427706754660bd3323398f76a8ff09639f 100644
--- a/chrome/browser/engagement/site_engagement_helper_unittest.cc
+++ b/chrome/browser/engagement/site_engagement_helper_unittest.cc
@@ -209,10 +209,9 @@ TEST_F(SiteEngagementHelperTest, MediaEngagementAccumulation) {
 TEST_F(SiteEngagementHelperTest, MediaEngagement) {
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
-  content::WebContents* contents = web_contents();
 
   base::MockTimer* media_tracker_timer = new base::MockTimer(true, false);
-  SiteEngagementHelper* helper = GetHelper(contents);
+  SiteEngagementHelper* helper = GetHelper(web_contents());
   SetMediaTrackerPauseTimer(helper, make_scoped_ptr(media_tracker_timer));
   SiteEngagementService* service =
       SiteEngagementServiceFactory::GetForProfile(profile());
@@ -230,7 +229,7 @@ TEST_F(SiteEngagementHelperTest, MediaEngagement) {
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
-  contents->WasHidden();
+  SimulateHide();
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.53, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
@@ -242,7 +241,7 @@ TEST_F(SiteEngagementHelperTest, MediaEngagement) {
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
-  contents->WasShown();
+  SimulateShow();
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.53, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
@@ -265,14 +264,14 @@ TEST_F(SiteEngagementHelperTest, MediaEngagement) {
   EXPECT_EQ(0.52, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
-  contents->WasHidden();
+  SimulateHide();
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.55, service->GetScore(url1));
   EXPECT_EQ(0.53, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   MediaStoppedPlaying(helper);
-  contents->WasShown();
+  SimulateShow();
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.55, service->GetScore(url1));
   EXPECT_EQ(0.53, service->GetScore(url2));
@@ -512,14 +511,14 @@ TEST_F(SiteEngagementHelperTest, ShowAndHide) {
   input_tracker_timer->Fire();
 
   // Hiding the tab should stop input tracking. Media tracking remains inactive.
-  contents->WasHidden();
+  SimulateHide();
   EXPECT_FALSE(input_tracker_timer->IsRunning());
   EXPECT_FALSE(media_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper));
 
   // Showing the tab should start tracking again after another delay. Media
   // tracking remains inactive.
-  contents->WasShown();
+  SimulateShow();
   EXPECT_TRUE(input_tracker_timer->IsRunning());
   EXPECT_FALSE(media_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper));
@@ -529,14 +528,14 @@ TEST_F(SiteEngagementHelperTest, ShowAndHide) {
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   // Hiding the tab should stop input tracking, but not media tracking.
-  contents->WasHidden();
+  SimulateHide();
   EXPECT_FALSE(input_tracker_timer->IsRunning());
   EXPECT_TRUE(media_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper));
 
   // Showing the tab should start tracking again after another delay. Media
   // tracking continues.
-  contents->WasShown();
+  SimulateShow();
   EXPECT_TRUE(input_tracker_timer->IsRunning());
   EXPECT_TRUE(media_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper));