OOBE: Test docked magnifier and virtual keyboard

This is a follow-up of CL:1855939

Bug: 833348
Change-Id: Id43ac9e389d88571463dd02f53e602d053ccdd56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865224Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707333}

ash/magnifier/docked_magnifier_controller_impl.cc

@@ -312,6 +312,10 @@ void DockedMagnifierControllerImpl::CenterOnPoint(
   viewport_magnifier_layer_->SetTransform(transform);
 }
 
+int DockedMagnifierControllerImpl::GetMagnifierHeightForTesting() const {
+  return GetTotalMagnifierHeight();
+}
+
 void DockedMagnifierControllerImpl::OnActiveUserPrefServiceChanged(
     PrefService* pref_service) {
   active_user_pref_service_ = pref_service;

ash/magnifier/docked_magnifier_controller_impl.h

@@ -79,6 +79,7 @@ class ASH_EXPORT DockedMagnifierControllerImpl
 
   // DockedMagnifierController:
   void CenterOnPoint(const gfx::Point& point_in_screen) override;
+  int GetMagnifierHeightForTesting() const override;
 
   // ash::SessionObserver:
   void OnActiveUserPrefServiceChanged(PrefService* pref_service) override;

ash/public/cpp/docked_magnifier_controller.h

@@ -26,6 +26,9 @@ class ASH_EXPORT DockedMagnifierController {
   // by itself.
   virtual void CenterOnPoint(const gfx::Point& point_in_screen) = 0;
 
+  // Returns docked magnifier height.
+  virtual int GetMagnifierHeightForTesting() const = 0;
+
  protected:
   virtual ~DockedMagnifierController() = default;
 };

chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

@@ -525,14 +525,16 @@ class AccessibilityManagerLoginTest : public OobeBaseTest {
   ~AccessibilityManagerLoginTest() override = default;
 
   void SetUpOnMainThread() override {
-    OobeBaseTest::SetUpOnMainThread();
+    // BrailleController has to be set before SetUpOnMainThread call as
+    // observers subscribe to the controller during SetUpOnMainThread.
     AccessibilityManager::SetBrailleControllerForTest(&braille_controller_);
     default_autoclick_delay_ = GetAutoclickDelay();
+    OobeBaseTest::SetUpOnMainThread();
   }
 
   void TearDownOnMainThread() override {
-    AccessibilityManager::SetBrailleControllerForTest(nullptr);
     OobeBaseTest::TearDownOnMainThread();
+    AccessibilityManager::SetBrailleControllerForTest(nullptr);
   }
 
   void CreateSession(const AccountId& account_id) {

chrome/browser/chromeos/login/accessibility_browsertest.cc

+// Copyright 2019 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 "ash/public/cpp/docked_magnifier_controller.h"
+#include "ash/public/cpp/keyboard/keyboard_controller.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
+#include "chrome/browser/chromeos/login/test/oobe_base_test.h"
+#include "chrome/browser/chromeos/login/ui/login_display_host.h"
+#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
+#include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/views/view_observer.h"
+
+namespace chromeos {
+
+class DockedMagnifierVirtualKeyboardTest
+    : public OobeBaseTest,
+      public views::ViewObserver,
+      public ChromeKeyboardControllerClient::Observer {
+ public:
+  DockedMagnifierVirtualKeyboardTest() = default;
+  ~DockedMagnifierVirtualKeyboardTest() override = default;
+
+ protected:
+  ChromeKeyboardControllerClient* keyboard_controller() {
+    return ChromeKeyboardControllerClient::Get();
+  }
+
+  MagnificationManager* magnification_manager() {
+    return MagnificationManager::Get();
+  }
+
+  WebUILoginView* webui_login_view() {
+    return LoginDisplayHost::default_host()->GetWebUILoginView();
+  }
+
+  gfx::Rect GetOobeBounds() { return webui_login_view()->GetBoundsInScreen(); }
+
+  void ShowDockedMagnifier() {
+    magnification_manager()->SetDockedMagnifierEnabled(true);
+    ASSERT_TRUE(magnification_manager()->IsDockedMagnifierEnabled());
+    ASSERT_GT(GetMagnifierHeight(), 0);
+  }
+
+  void HideDockedMagnifier() {
+    magnification_manager()->SetDockedMagnifierEnabled(false);
+    ASSERT_FALSE(magnification_manager()->IsDockedMagnifierEnabled());
+    ASSERT_EQ(GetMagnifierHeight(), 0);
+  }
+
+  int GetMagnifierHeight() {
+    return ash::DockedMagnifierController::Get()
+        ->GetMagnifierHeightForTesting();
+  }
+
+  void ShowKeyboard() {
+    AccessibilityManager::Get()->EnableVirtualKeyboard(true);
+    keyboard_controller()->ShowKeyboard();
+    keyboard_controller()->SetKeyboardLocked(true);
+    WaitForBoundsToChange();
+    ASSERT_GT(GetKeyboardHeight(), 0);
+  }
+
+  void HideKeyboard() {
+    keyboard_controller()->HideKeyboard(ash::HideReason::kUser);
+    ASSERT_EQ(GetKeyboardHeight(), 0);
+  }
+
+  int GetKeyboardHeight() { return keyboard_bounds_.height(); }
+
+  void WaitForBoundsToChange() {
+    ASSERT_FALSE(run_loop_);
+    run_loop_ = std::make_unique<base::RunLoop>();
+    run_loop_->Run();
+    run_loop_.reset();
+  }
+
+ private:
+  // views::ViewObserver:
+  void OnViewBoundsChanged(views::View* observed_view) override {
+    ASSERT_EQ(observed_view, webui_login_view());
+    if (run_loop_)
+      run_loop_->Quit();
+  }
+
+  // ChromeKeyboardControllerClient::Observer:
+  void OnKeyboardOccludedBoundsChanged(
+      const gfx::Rect& screen_bounds) override {
+    keyboard_bounds_ = screen_bounds;
+  }
+
+  // OobeBaseTest:
+  void SetUpOnMainThread() override {
+    OobeBaseTest::SetUpOnMainThread();
+    webui_login_view()->views::View::AddObserver(this);
+    keyboard_controller()->AddObserver(this);
+  }
+
+  void TearDownOnMainThread() override {
+    webui_login_view()->views::View::RemoveObserver(this);
+    keyboard_controller()->RemoveObserver(this);
+    OobeBaseTest::TearDownOnMainThread();
+  }
+
+  std::unique_ptr<base::RunLoop> run_loop_;
+  gfx::Rect keyboard_bounds_;
+};
+
+IN_PROC_BROWSER_TEST_F(DockedMagnifierVirtualKeyboardTest, WelcomeScreen) {
+  const gfx::Rect original_bounds = GetOobeBounds();
+  gfx::Rect expected_bounds(original_bounds);
+
+  ShowDockedMagnifier();
+  expected_bounds.Inset(0, GetMagnifierHeight(), 0, 0);
+  EXPECT_EQ(expected_bounds, GetOobeBounds());
+
+  ShowKeyboard();
+  expected_bounds.Inset(0, 0, 0, GetKeyboardHeight());
+  EXPECT_EQ(expected_bounds, GetOobeBounds());
+
+  expected_bounds.Inset(0, -GetMagnifierHeight(), 0, 0);
+  HideDockedMagnifier();
+  EXPECT_EQ(expected_bounds, GetOobeBounds());
+
+  HideKeyboard();
+  EXPECT_EQ(original_bounds, GetOobeBounds());
+}
+
+}  // namespace chromeos

chrome/browser/chromeos/login/saml/saml_browsertest.cc

@@ -77,7 +77,6 @@
 #include "components/account_id/account_id.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "components/guest_view/browser/test_guest_view_manager.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"
@@ -95,7 +94,6 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
-#include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/common/features/feature_channel.h"
 #include "google_apis/gaia/fake_gaia.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ -831,22 +829,15 @@ class SAMLEnrollmentTest : public SamlTest {
   void SetUpOnMainThread() override;
   void StartSamlAndWaitForIdpPageLoad(const std::string& gaia_email) override;
 
-  guest_view::TestGuestViewManager* GetGuestViewManager();
-  content::WebContents* GetEnrollmentContents();
-
  protected:
   LocalPolicyTestServerMixin local_policy_mixin_{&mixin_host_};
   test::EnrollmentUIMixin enrollment_ui_{&mixin_host_};
 
-  guest_view::TestGuestViewManagerFactory guest_view_manager_factory_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SAMLEnrollmentTest);
 };
 
 SAMLEnrollmentTest::SAMLEnrollmentTest() {
-  guest_view::GuestViewManager::set_factory_for_testing(
-      &guest_view_manager_factory_);
   gaia_frame_parent_ = "oauth-enroll-auth-view";
   authenticator_id_ = "$('enterprise-enrollment').authenticator_";
 }
@@ -867,32 +858,14 @@ void SAMLEnrollmentTest::SetUpOnMainThread() {
 
 void SAMLEnrollmentTest::StartSamlAndWaitForIdpPageLoad(
     const std::string& gaia_email) {
-  WaitForSigninScreen();
-  ExistingUserController::current_controller()->OnStartEnterpriseEnrollment();
-  while (!GetEnrollmentContents()) {
-    GetGuestViewManager()->WaitForNextGuestCreated();
-  }
-  // Wait for Gaia is ready.
-  OobeBaseTest::WaitForGaiaPageEvent("backButton");
+  LoginDisplayHost::default_host()->StartWizard(
+      EnrollmentScreenView::kScreenId);
+  WaitForGaiaPageBackButtonUpdate();
   SigninFrameJS().TypeIntoPath(gaia_email, {"identifier"});
   SigninFrameJS().TapOn("nextButton");
   OobeBaseTest::WaitForGaiaPageEvent("authFlowChange");
 }
 
-guest_view::TestGuestViewManager* SAMLEnrollmentTest::GetGuestViewManager() {
-  return static_cast<guest_view::TestGuestViewManager*>(
-      guest_view::TestGuestViewManager::FromBrowserContext(
-          ProfileHelper::GetSigninProfile()));
-}
-
-content::WebContents* SAMLEnrollmentTest::GetEnrollmentContents() {
-  content::RenderFrameHost* frame_host =
-      signin::GetAuthFrame(GetLoginUI()->GetWebContents(), gaia_frame_parent_);
-  if (!frame_host)
-    return nullptr;
-  return content::WebContents::FromRenderFrameHost(frame_host);
-}
-
 IN_PROC_BROWSER_TEST_F(SAMLEnrollmentTest, WithoutCredentialsPassingAPI) {
   fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html");
   StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail);
@@ -1106,7 +1079,6 @@ void SAMLPolicyTest::SetLoginVideoCaptureAllowedUrls(
 }
 
 void SAMLPolicyTest::ShowGAIALoginForm() {
-  login_screen_load_observer_->Wait();
   content::DOMMessageQueue message_queue;
   ASSERT_TRUE(content::ExecuteScript(
       GetLoginUI()->GetWebContents(),
@@ -1121,7 +1093,6 @@ void SAMLPolicyTest::ShowGAIALoginForm() {
 }
 
 void SAMLPolicyTest::ShowSAMLInterstitial() {
-  login_screen_load_observer_->Wait();
   WaitForOobeUI();
 
   std::string js =
@@ -1151,8 +1122,6 @@ void SAMLPolicyTest::ShowSAMLInterstitial() {
 }
 
 void SAMLPolicyTest::ClickNextOnSAMLInterstitialPage() {
-  login_screen_load_observer_->Wait();
-
   content::DOMMessageQueue message_queue;
   SetupAuthFlowChangeListener();
 
@@ -1168,8 +1137,6 @@ void SAMLPolicyTest::ClickNextOnSAMLInterstitialPage() {
 }
 
 void SAMLPolicyTest::ClickChangeAccountOnSAMLInterstitialPage() {
-  login_screen_load_observer_->Wait();
-
   std::string js =
       "$('gaia-signin').authenticator_.addEventListener('ready', function() {"
       "  window.domAutomationController.send('ready');"
@@ -1253,7 +1220,6 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, PRE_NoSAML) {
 // Verifies that the offline login time limit does not affect a user who
 // authenticated without SAML.
 IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, NoSAML) {
-  login_screen_load_observer_->Wait();
   // Verify that offline login is allowed.
   test::OobeJS().ExpectTrue(
       "window.getComputedStyle(document.querySelector("
@@ -1270,7 +1236,6 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, PRE_SAMLNoLimit) {
 // Verifies that when no offline login time limit is set, a user who
 // authenticated with SAML is allowed to log in offline.
 IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, SAMLNoLimit) {
-  login_screen_load_observer_->Wait();
   // Verify that offline login is allowed.
   test::OobeJS().ExpectTrue(
       "window.getComputedStyle(document.querySelector("
@@ -1287,7 +1252,6 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, PRE_SAMLZeroLimit) {
 // Verifies that when the offline login time limit is exceeded for a user who
 // authenticated via SAML, that user is forced to log in online the next time.
 IN_PROC_BROWSER_TEST_F(SAMLPolicyTestWebUILogin, SAMLZeroLimit) {
-  login_screen_load_observer_->Wait();
   // Verify that offline login is not allowed.
   test::OobeJS().ExpectTrue(
       "window.getComputedStyle(document.querySelector("

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

@@ -304,11 +304,6 @@ class OAuth2Test : public OobeBaseTest {
   }
 
   void LoginAsExistingUser() {
-    content::WindowedNotificationObserver(
-        chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-        content::NotificationService::AllSources())
-        .Wait();
-
     test::OobeJS().ExpectTrue("!!document.querySelector('#account-picker')");
     test::OobeJS().ExpectTrue("!!document.querySelector('#pod-row')");
 
@@ -572,11 +567,6 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, PRE_MergeSession) {
 IN_PROC_BROWSER_TEST_F(OAuth2Test, DISABLED_MergeSession) {
   SimulateNetworkOnline();
 
-  content::WindowedNotificationObserver(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources())
-      .Wait();
-
   test::OobeJS().ExpectTrue("!!document.querySelector('#account-picker')");
   test::OobeJS().ExpectTrue("!!document.querySelector('#pod-row')");
 
@@ -610,12 +600,6 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, DISABLED_OverlappingContinueSessionRestore) {
   SetupGaiaServerForUnexpiredAccount();
   SimulateNetworkOnline();
 
-  // Waits for login screen to be ready.
-  content::WindowedNotificationObserver(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources())
-      .Wait();
-
   // Blocks database thread to control TokenService::LoadCredentials timing.
   // TODO(achuith): Fix this. crbug.com/753615.
   auto thread_blocker = std::make_unique<ThreadBlocker>(nullptr);
@@ -730,12 +714,6 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, SetInvalidTokenStatus) {
   SetupGaiaServerForUnexpiredAccount();
   SimulateNetworkOnline();
 
-  // Waits for login screen to be ready.
-  content::WindowedNotificationObserver(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources())
-      .Wait();
-
   // Signs in as the existing user created in pre test.
   ExistingUserController* const controller =
       ExistingUserController::current_controller();

chrome/browser/chromeos/login/sync_consent_interactive_ui_test.cc

@@ -114,13 +114,6 @@ class SyncConsentTest : public OobeBaseTest {
     OobeBaseTest::TearDownOnMainThread();
   }
 
-  void WaitForUIToLoad() {
-    content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-        content::NotificationService::AllSources());
-    observer.Wait();
-  }
-
   void SwitchLanguage(const std::string& language) {
     const char get_num_reloads[] = "Oobe.getInstance().reloadContentNumEvents_";
     const int prev_reloads = test::OobeJS().GetInt(get_num_reloads);
@@ -212,7 +205,6 @@ class SyncConsentTest : public OobeBaseTest {
 };
 
 IN_PROC_BROWSER_TEST_F(SyncConsentTest, SyncConsentRecorder) {
-  WaitForUIToLoad();
   EXPECT_EQ(g_browser_process->GetApplicationLocale(), "en-US");
   LoginToSyncConsentScreen();
   // For En-US we hardcode strings here to catch string issues too.
@@ -245,7 +237,6 @@ class SyncConsentTestWithParams
 IN_PROC_BROWSER_TEST_P(SyncConsentTestWithParams, SyncConsentTestWithLocale) {
   LOG(INFO) << "SyncConsentTestWithParams() started with param='" << GetParam()
             << "'";
-  WaitForUIToLoad();
   EXPECT_EQ(g_browser_process->GetApplicationLocale(), "en-US");
   SwitchLanguage(GetParam());
   LoginToSyncConsentScreen();

chrome/browser/chromeos/login/test/oobe_base_test.cc

@@ -103,6 +103,7 @@ void OobeBaseTest::WaitForOobeUI() {
           run_loop.QuitClosure())) {
     run_loop.Run();
   }
+  MaybeWaitForLoginScreenLoad();
 }
 
 void OobeBaseTest::WaitForGaiaPageLoad() {
@@ -159,7 +160,7 @@ void OobeBaseTest::WaitForSigninScreen() {
 
   WizardController::SkipPostLoginScreensForTesting();
 
-  login_screen_load_observer_->Wait();
+  MaybeWaitForLoginScreenLoad();
 }
 
 test::JSChecker OobeBaseTest::SigninFrameJS() {
@@ -172,4 +173,11 @@ test::JSChecker OobeBaseTest::SigninFrameJS() {
   return result;
 }
 
+void OobeBaseTest::MaybeWaitForLoginScreenLoad() {
+  if (!login_screen_load_observer_)
+    return;
+  login_screen_load_observer_->Wait();
+  login_screen_load_observer_.reset();
+}
+
 }  // namespace chromeos

chrome/browser/chromeos/login/test/oobe_base_test.h

@@ -58,13 +58,18 @@ class OobeBaseTest : public MixinBasedInProcessBrowserTest {
   // is set before SetUpCommandLine is invoked.
   bool needs_background_networking_ = false;
 
-  std::unique_ptr<content::WindowedNotificationObserver>
-      login_screen_load_observer_;
   std::string gaia_frame_parent_ = "signin-frame";
   std::string authenticator_id_ = "$('gaia-signin').authenticator_";
   EmbeddedTestServerSetupMixin embedded_test_server_{&mixin_host_,
                                                      embedded_test_server()};
 
+ private:
+  // Waits for login_screen_load_observer_ and resets it afterwards.
+  void MaybeWaitForLoginScreenLoad();
+
+  std::unique_ptr<content::WindowedNotificationObserver>
+      login_screen_load_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
 };
 

chrome/browser/chromeos/login/test/oobe_screens_utils.cc

@@ -42,10 +42,6 @@ void WaitForExit(OobeScreenId screen_id) {
 }  // namespace
 
 void WaitForWelcomeScreen() {
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources());
-  observer.Wait();
   WaitFor(WelcomeView::kScreenId);
 }
 

chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc

@@ -84,9 +84,6 @@ IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, PRE_TwoRuns) {
 
 IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, TwoRuns) {
   SetUpResolution();
-  content::WindowedNotificationObserver(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources()).Wait();
   LogIn(kAccountId, kAccountPassword, kEmptyServices);
 
   const Browser* const browser = OpenNewBrowserWindow();

chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

@@ -85,9 +85,6 @@ IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, PRE_LogInAndVerify) {
 
 // Verify that the policies are honored on an existing user's login.
 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, LogInAndVerify) {
-  content::WindowedNotificationObserver(
-      chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-      content::NotificationService::AllSources()).Wait();
   LogInAndVerifyStartUpURLs();
 }
 

chrome/test/BUILD.gn

@@ -2096,6 +2096,7 @@ if (!is_android) {
         "../browser/chromeos/input_method/textinput_test_helper.h",
         "../browser/chromeos/lock_screen_apps/note_taking_browsertest.cc",
         "../browser/chromeos/logging_browsertest.cc",
+        "../browser/chromeos/login/accessibility_browsertest.cc",
         "../browser/chromeos/login/active_directory_login_browsertest.cc",
         "../browser/chromeos/login/arc_terms_of_service_browsertest.cc",
         "../browser/chromeos/login/auto_launched_kiosk_browsertest.cc",