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

chrome/browser/notifications/notification_permission_context_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/notifications/notification_permission_context.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/time/time.h"
@@ skipping 148 matching lines @@
   ASSERT_FALSE(permission_context.last_permission_set_persisted());
   ASSERT_EQ(CONTENT_SETTING_DEFAULT,
             permission_context.last_permission_set_setting());
 
   permission_context.RequestPermission(
       web_contents(), id, url, base::Bind(&DoNothing));
 
   // Should be blocked after 1-2 seconds, but the timer is reset whenever the
   // tab is not visible, so these 500ms never add up to >= 1 second.
   for (int n = 0; n < 10; n++) {
-    web_contents()->WasShown();
+    SimulateShow();
     task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500));
-    web_contents()->WasHidden();
+    SimulateHide();
   }
 
   EXPECT_EQ(0, permission_context.permission_set_count());
   EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_context.GetContentSettingFromMap(url, url));
 
   // Time elapsed whilst hidden is not counted.
   // n.b. This line also clears out any old scheduled timer tasks. This is
   // important, because otherwise Timer::Reset (triggered by
   // VisibilityTimerTabHelper::WasShown) may choose to re-use an existing
   // scheduled task, and when it fires Timer::RunScheduledTask will call
   // TimeTicks::Now() (which unlike task_runner->NowTicks(), we can't fake),
   // and miscalculate the remaining delay at which to fire the timer.
   task_runner->FastForwardBy(base::TimeDelta::FromDays(1));
 
   EXPECT_EQ(0, permission_context.permission_set_count());
   EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_context.GetContentSettingFromMap(url, url));
 
   // Should be blocked after 1-2 seconds. So 500ms is not enough.
-  web_contents()->WasShown();
+  SimulateShow();
   task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500));
 
   EXPECT_EQ(0, permission_context.permission_set_count());
   EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_context.GetContentSettingFromMap(url, url));
 
   // But 5*500ms > 2 seconds, so it should now be blocked.
   for (int n = 0; n < 4; n++)
     task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500));
 
@@ skipping 37 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_context.GetContentSettingFromMap(url, url));
 }
 
 // Tests how multiple parallel permission requests get auto-denied in incognito.
 TEST_F(NotificationPermissionContextTest, TestParallelDenyInIncognito) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
   GURL url("https://www.example.com");
   NavigateAndCommit(url);
-  web_contents()->WasShown();
+  SimulateShow();
 
   const PermissionRequestID id0(web_contents()->GetRenderProcessHost()->GetID(),
                                 web_contents()->GetMainFrame()->GetRoutingID(),
                                 0);
   const PermissionRequestID id1(web_contents()->GetRenderProcessHost()->GetID(),
                                 web_contents()->GetMainFrame()->GetRoutingID(),
                                 1);
 
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner(SwitchToMockTime());
 
@@ skipping 30 matching lines @@
   // After another 2.5 seconds, the second permission request should also have
   // received a response.
   task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(2500));
   EXPECT_EQ(2, permission_context.permission_set_count());
   EXPECT_TRUE(permission_context.last_permission_set_persisted());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             permission_context.last_permission_set_setting());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             permission_context.GetContentSettingFromMap(url, url));
 }