cros: Remove some unused ScreenLockerTester methods

TBR=dtseng@chromium.org

Bug: 899777
Change-Id: I2301630944dbd19198a9d09d4030dde2ddacb587
Reviewed-on: https://chromium-review.googlesource.com/c/1303051
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605482}

chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc

@@ -242,7 +242,6 @@ IN_PROC_BROWSER_TEST_F(UsersPrivateApiLockStatusTest, ScreenLock) {
   chromeos::ScreenLocker::Show();
   std::unique_ptr<chromeos::test::ScreenLockerTester> tester(
       chromeos::ScreenLocker::GetTester());
-  tester->EmulateWindowManagerReady();
   content::WindowedNotificationObserver lock_state_observer(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::NotificationService::AllSources());

chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc

@@ -102,7 +102,6 @@ class ScreenLockerTest : public InProcessBrowserTest {
 
   void LockScreen(test::ScreenLockerTester* tester) {
     ScreenLocker::Show();
-    tester->EmulateWindowManagerReady();
     content::WindowedNotificationObserver lock_state_observer(
         chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
         content::NotificationService::AllSources());
@@ -158,7 +157,6 @@ IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, TestBasic) {
     return;
   ScreenLocker::Show();
   std::unique_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
-  tester->EmulateWindowManagerReady();
   content::WindowedNotificationObserver lock_state_observer(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::NotificationService::AllSources());
@@ -167,13 +165,6 @@ IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, TestBasic) {
   EXPECT_EQ(session_manager::SessionState::LOCKED,
             session_manager::SessionManager::Get()->session_state());
 
-  // Test to make sure that the widget is actually appearing and is of
-  // reasonable size, preventing a regression of
-  // http://code.google.com/p/chromium-os/issues/detail?id=5987
-  gfx::Rect lock_bounds = tester->GetChildWidget()->GetWindowBoundsInScreen();
-  EXPECT_GT(lock_bounds.width(), 10);
-  EXPECT_GT(lock_bounds.height(), 10);
-
   UserContext user_context(user_manager::UserType::USER_TYPE_REGULAR,
                            user_manager::StubAccountId());
   user_context.SetKey(Key("pass"));
@@ -238,7 +229,6 @@ IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, MAYBE_TestFullscreenExit) {
   {
     Waiter waiter(browser());
     ScreenLocker::Show();
-    tester->EmulateWindowManagerReady();
     waiter.Wait(true /* locked */, true /* full screen */);
     EXPECT_TRUE(browser_window->IsFullscreen());
     EXPECT_FALSE(window_state->GetHideShelfWhenFullscreen());
@@ -284,7 +274,6 @@ IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, MAYBE_TestFullscreenExit) {
   {
     Waiter waiter(browser());
     ScreenLocker::Show();
-    tester->EmulateWindowManagerReady();
     waiter.Wait(true /* locked */, false /* full screen */);
     EXPECT_FALSE(browser_window->IsFullscreen());
     EXPECT_TRUE(tester->IsLocked());
@@ -327,27 +316,4 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }
 
-// TODO(flackr): Find out why the RenderView isn't getting the escape press
-// and re-enable this test (currently this test is flaky).
-IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestEscape) {
-  std::unique_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
-  LockScreen(tester.get());
-
-  EXPECT_EQ(
-      1, fake_session_manager_client_->notify_lock_screen_shown_call_count());
-
-  tester->SetPassword("password");
-  EXPECT_EQ("password", tester->GetPassword());
-  // Escape clears the password.
-  SimulateKeyPress(tester->GetWidget(), ui::VKEY_ESCAPE);
-  content::RunAllPendingInMessageLoop();
-  EXPECT_EQ("", tester->GetPassword());
-
-  // Close the locker to match expectations.
-  ScreenLocker::Hide();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_FALSE(tester->IsLocked());
-  EXPECT_TRUE(VerifyLockScreenDismissed());
-}
-
 }  // namespace chromeos

chrome/browser/chromeos/login/lock/screen_locker_tester.cc

@@ -98,9 +98,6 @@ class WebUIScreenLockerTester : public ScreenLockerTester {
   void SetPassword(const std::string& password) override;
   std::string GetPassword() override;
   void EnterPassword(const std::string& password) override;
-  void EmulateWindowManagerReady() override;
-  views::Widget* GetWidget() const override;
-  views::Widget* GetChildWidget() const override;
 
  private:
   friend class chromeos::ScreenLocker;
@@ -159,16 +156,6 @@ void WebUIScreenLockerTester::EnterPassword(const std::string& password) {
   login.WaitForAttempt();
 }
 
-void WebUIScreenLockerTester::EmulateWindowManagerReady() {}
-
-views::Widget* WebUIScreenLockerTester::GetWidget() const {
-  return webui_screen_locker()->lock_window_;
-}
-
-views::Widget* WebUIScreenLockerTester::GetChildWidget() const {
-  return webui_screen_locker()->lock_window_;
-}
-
 content::RenderFrameHost* WebUIScreenLockerTester::GetMainFrame() const {
   return webui()->GetWebContents()->GetMainFrame();
 }

chrome/browser/chromeos/login/lock/screen_locker_tester.h

@@ -7,10 +7,6 @@
 
 #include <string>
 
-namespace views {
-class Widget;
-}  // namespace views
-
 namespace chromeos {
 
 class UserContext;
@@ -38,14 +34,6 @@ class ScreenLockerTester {
 
   // Emulates entring a password.
   virtual void EnterPassword(const std::string& password) = 0;
-
-  // Emulates the ready message from window manager.
-  virtual void EmulateWindowManagerReady() = 0;
-
-  // Returns the widget for screen locker window.
-  virtual views::Widget* GetWidget() const = 0;
-
-  virtual views::Widget* GetChildWidget() const = 0;
 };
 
 }  // namespace test

chrome/browser/chromeos/shutdown_policy_browsertest.cc

@@ -239,7 +239,6 @@ class ShutdownPolicyLockerTest : public ShutdownPolicyBaseTest {
     // Bring up the locker screen.
     ScreenLocker::Show();
     std::unique_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
-    tester->EmulateWindowManagerReady();
     content::WindowedNotificationObserver lock_state_observer(
         chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
         content::NotificationService::AllSources());

chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

@@ -306,7 +306,6 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest {
 
   void LockScreen(ScreenLockerTester* tester) {
     ScreenLocker::Show();
-    tester->EmulateWindowManagerReady();
     content::WindowedNotificationObserver lock_state_observer(
         chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
         content::NotificationService::AllSources());