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

chrome/browser/engagement/site_engagement_helper_unittest.cc

 // Copyright 2015 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 "chrome/browser/engagement/site_engagement_helper.h"
 
 #include "base/test/histogram_tester.h"
 #include "base/timer/mock_timer.h"
 #include "base/values.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
@@ skipping 191 matching lines @@
   HandleMediaPlaying(helper, false);
   HandleMediaPlaying(helper, false);
   EXPECT_DOUBLE_EQ(0.6, service->GetScore(url1));
   EXPECT_DOUBLE_EQ(0.54, service->GetScore(url2));
   EXPECT_DOUBLE_EQ(1.14, service->GetTotalEngagementPoints());
 }
 
 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());
   DCHECK(service);
 
   Navigate(url1);
   MediaStartedPlaying(helper);
 
   EXPECT_DOUBLE_EQ(0.50, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.52, service->GetScore(url1));
   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));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   MediaStoppedPlaying(helper);
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.53, service->GetScore(url1));
   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));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   MediaStartedPlaying(helper);
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.55, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 
   Navigate(url2);
   EXPECT_DOUBLE_EQ(0.55, service->GetScore(url1));
   EXPECT_EQ(0.5, service->GetScore(url2));
   EXPECT_FALSE(media_tracker_timer->IsRunning());
 
   MediaStartedPlaying(helper);
   media_tracker_timer->Fire();
   EXPECT_DOUBLE_EQ(0.55, service->GetScore(url1));
   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));
   EXPECT_TRUE(media_tracker_timer->IsRunning());
 }
 
 TEST_F(SiteEngagementHelperTest, MixedInputEngagementAccumulation) {
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
   content::WebContents* contents = web_contents();
@@ skipping 219 matching lines @@
   base::MockTimer* input_tracker_timer = new base::MockTimer(true, false);
   base::MockTimer* media_tracker_timer = new base::MockTimer(true, false);
   SiteEngagementHelper* helper = GetHelper(contents);
   SetInputTrackerPauseTimer(helper, make_scoped_ptr(input_tracker_timer));
   SetMediaTrackerPauseTimer(helper, make_scoped_ptr(media_tracker_timer));
 
   Navigate(url1);
   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));
 
   // Start media tracking.
   MediaStartedPlaying(helper);
   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));
 
   input_tracker_timer->Fire();
   media_tracker_timer->Fire();
   EXPECT_FALSE(input_tracker_timer->IsRunning());
   EXPECT_TRUE(media_tracker_timer->IsRunning());
   EXPECT_TRUE(IsTrackingInput(helper));
 }
@@ skipping 21 matching lines @@
   // When the timer fires, callbacks are added.
   input_tracker_timer->Fire();
   EXPECT_FALSE(input_tracker_timer->IsRunning());
   EXPECT_TRUE(IsTrackingInput(helper));
 
   // Navigation should start the initial delay timer again.
   Navigate(url1);
   EXPECT_TRUE(input_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper));
 }