[Kiosk] Remove leftovers of legacy kiosk controllers

Bug: 1015383
Change-Id: I196327e40dcc0dd79c092e265e29134395bc1f9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309431Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790827}

chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc

@@ -132,7 +132,7 @@ class AutoLaunchedKioskTest : public MixinBasedInProcessBrowserTest {
 
   void SetUp() override {
     skip_splash_wait_override_ =
-        AppLaunchController::SkipSplashScreenWaitForTesting();
+        KioskLaunchController::SkipSplashScreenWaitForTesting();
     login_manager_.set_session_restore_enabled();
     login_manager_.SetDefaultLoginSwitches(
         {std::make_pair("test_switch_1", ""),

chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc

@@ -871,7 +871,7 @@ class KioskEnrollmentTest : public EnrollmentLocalPolicyServerBase {
   void SetUp() override {
     needs_background_networking_ = true;
     skip_splash_wait_override_ =
-        AppLaunchController::SkipSplashScreenWaitForTesting();
+        KioskLaunchController::SkipSplashScreenWaitForTesting();
     EnrollmentLocalPolicyServerBase::SetUp();
   }
 

chrome/browser/chromeos/login/error_screen_browsertest.cc

@@ -251,8 +251,8 @@ class KioskErrorScreenTest : public MixinBasedInProcessBrowserTest {
     host_resolver()->AddRule("*", "127.0.0.1");
 
     skip_splash_wait_override_ =
-        AppLaunchController::SkipSplashScreenWaitForTesting();
-    network_wait_override_ = AppLaunchController::SetNetworkWaitForTesting(
+        KioskLaunchController::SkipSplashScreenWaitForTesting();
+    network_wait_override_ = KioskLaunchController::SetNetworkWaitForTesting(
         base::TimeDelta::FromSeconds(0));
 
     fake_cws_.Init(embedded_test_server());

chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -475,8 +475,8 @@ class KioskTest : public OobeBaseTest {
     mock_user_manager_.reset(new MockUserManager);
     ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
     skip_splash_wait_override_ =
-        AppLaunchController::SkipSplashScreenWaitForTesting();
-    network_wait_override_ = AppLaunchController::SetNetworkWaitForTesting(
+        KioskLaunchController::SkipSplashScreenWaitForTesting();
+    network_wait_override_ = KioskLaunchController::SetNetworkWaitForTesting(
         base::TimeDelta::FromSeconds(kTestNetworkTimeoutSeconds));
 
     OobeBaseTest::SetUp();
@@ -503,7 +503,7 @@ class KioskTest : public OobeBaseTest {
   void TearDownOnMainThread() override {
     owner_settings_service_.reset();
     settings_helper_.RestoreRealDeviceSettingsProvider();
-    AppLaunchController::SetNetworkTimeoutCallbackForTesting(nullptr);
+    KioskLaunchController::SetNetworkTimeoutCallbackForTesting(nullptr);
     AppLaunchSigninScreen::SetUserManagerForTesting(nullptr);
 
     OobeBaseTest::TearDownOnMainThread();
@@ -657,7 +657,7 @@ class KioskTest : public OobeBaseTest {
   }
 
   void WaitForAppLaunchNetworkTimeout() {
-    if (GetAppLaunchController()->network_wait_timedout())
+    if (GetKioskLaunchController()->network_wait_timedout())
       return;
 
     scoped_refptr<content::MessageLoopRunner> runner =
@@ -665,11 +665,11 @@ class KioskTest : public OobeBaseTest {
 
     base::OnceClosure callback =
         base::BindOnce(&OnNetworkWaitTimedOut, runner->QuitClosure());
-    AppLaunchController::SetNetworkTimeoutCallbackForTesting(&callback);
+    KioskLaunchController::SetNetworkTimeoutCallbackForTesting(&callback);
 
     runner->Run();
 
-    CHECK(GetAppLaunchController()->network_wait_timedout());
+    CHECK(GetKioskLaunchController()->network_wait_timedout());
   }
 
   void EnableConsumerKioskMode() {
@@ -717,7 +717,8 @@ class KioskTest : public OobeBaseTest {
 
     // Configure network should bring up lock screen for owner.
     OobeScreenWaiter lock_screen_waiter(OobeScreen::SCREEN_ACCOUNT_PICKER);
-    static_cast<AppLaunchSplashScreenView::Delegate*>(GetAppLaunchController())
+    static_cast<AppLaunchSplashScreenView::Delegate*>(
+        GetKioskLaunchController())
         ->OnConfigureNetwork();
     lock_screen_waiter.Wait();
 
@@ -726,11 +727,11 @@ class KioskTest : public OobeBaseTest {
 
     // A network error screen should be shown after authenticating.
     OobeScreenWaiter error_screen_waiter(ErrorScreenView::kScreenId);
-    static_cast<AppLaunchSigninScreen::Delegate*>(GetAppLaunchController())
+    static_cast<AppLaunchSigninScreen::Delegate*>(GetKioskLaunchController())
         ->OnOwnerSigninSuccess();
     error_screen_waiter.Wait();
 
-    ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
+    ASSERT_TRUE(GetKioskLaunchController()->showing_network_dialog());
 
     SimulateNetworkOnline();
     WaitForAppLaunchSuccess();
@@ -782,14 +783,14 @@ class KioskTest : public OobeBaseTest {
         NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE);
   }
 
-  AppLaunchController* GetAppLaunchController() {
-    return LoginDisplayHost::default_host()->GetAppLaunchController();
+  KioskLaunchController* GetKioskLaunchController() {
+    return LoginDisplayHost::default_host()->GetKioskLaunchController();
   }
 
   void BlockAppLaunch(bool block) {
     if (block) {
       block_app_launch_override_ =
-          AppLaunchController::BlockAppLaunchForTesting();
+          KioskLaunchController::BlockAppLaunchForTesting();
     } else {
       block_app_launch_override_.reset();
     }
@@ -978,7 +979,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
   GetLoginUI()->CallJavascriptFunctionUnsafe(
       "cr.ui.Oobe.handleAccelerator", base::Value("app_launch_network_config"));
   error_screen_waiter.Wait();
-  ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
+  ASSERT_TRUE(GetKioskLaunchController()->showing_network_dialog());
 
   // Continue button should be visible since we are online.
   test::OobeJS().ExpectVisible("error-message-md-continue-button");
@@ -1030,7 +1031,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, DISABLED_LaunchAppNetworkPortal) {
   // require owner auth to configure network.
   OobeScreenWaiter(ErrorScreenView::kScreenId).Wait();
 
-  ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
+  ASSERT_TRUE(GetKioskLaunchController()->showing_network_dialog());
   SimulateNetworkOnline();
   WaitForAppLaunchSuccess();
 }
@@ -1417,7 +1418,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, NoEnterpriseAutoLaunchWhenUntrusted) {
   login_display_host->StartKiosk(KioskAppId::ForChromeApp(test_app_id()), true);
 
   // Check that no launch has started.
-  EXPECT_FALSE(login_display_host->GetAppLaunchController());
+  EXPECT_FALSE(login_display_host->GetKioskLaunchController());
 }
 
 IN_PROC_BROWSER_TEST_F(KioskTest, SpokenFeedback) {

chrome/browser/chromeos/login/kiosk_launch_controller.h

@@ -192,18 +192,6 @@ class KioskLaunchController : public KioskProfileLoader::Delegate,
   base::WeakPtrFactory<KioskLaunchController> weak_ptr_factory_{this};
 };
 
-// TODO(crbug.com/1046364): Some places are still using legacy kiosk controllers
-// names. This is done in order not to break them. Remove this.
-class ArcKioskController : public KioskLaunchController {
-  using KioskLaunchController::KioskLaunchController;
-};
-class AppLaunchController : public KioskLaunchController {
-  using KioskLaunchController::KioskLaunchController;
-};
-class WebKioskController : public KioskLaunchController {
-  using KioskLaunchController::KioskLaunchController;
-};
-
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_KIOSK_LAUNCH_CONTROLLER_H_

chrome/browser/chromeos/login/kiosk_launch_controller_browsertest.cc

@@ -24,8 +24,8 @@ namespace chromeos {
 
 class KioskLaunchControllerTest : public InProcessBrowserTest {
  public:
-  using AppState = WebKioskController::AppState;
-  using NetworkUIState = WebKioskController::NetworkUIState;
+  using AppState = KioskLaunchController::AppState;
+  using NetworkUIState = KioskLaunchController::NetworkUIState;
 
   KioskLaunchControllerTest() = default;
   KioskLaunchControllerTest(const KioskLaunchControllerTest&) = delete;

chrome/browser/chromeos/login/ui/fake_login_display_host.cc

@@ -72,7 +72,7 @@ WizardController* FakeLoginDisplayHost::GetWizardController() {
   return wizard_controller_.get();
 }
 
-AppLaunchController* FakeLoginDisplayHost::GetAppLaunchController() {
+KioskLaunchController* FakeLoginDisplayHost::GetKioskLaunchController() {
   return nullptr;
 }
 

chrome/browser/chromeos/login/ui/fake_login_display_host.h

@@ -35,7 +35,7 @@ class FakeLoginDisplayHost : public LoginDisplayHost {
   void SetStatusAreaVisible(bool visible) override;
   void StartWizard(chromeos::OobeScreenId first_screen) override;
   WizardController* GetWizardController() override;
-  AppLaunchController* GetAppLaunchController() override;
+  KioskLaunchController* GetKioskLaunchController() override;
   void StartUserAdding(base::OnceClosure completion_callback) override;
   void CancelUserAdding() override;
   void StartSignInScreen() override;

chrome/browser/chromeos/login/ui/login_display_host.h

@@ -30,7 +30,7 @@ class WebContents;
 
 namespace chromeos {
 
-class AppLaunchController;
+class KioskLaunchController;
 class ExistingUserController;
 class OobeUI;
 class WebUILoginView;
@@ -103,9 +103,9 @@ class LoginDisplayHost {
   // Result should not be stored.
   virtual WizardController* GetWizardController() = 0;
 
-  // Returns current AppLaunchController, if it exists.
+  // Returns current KioskLaunchController, if it exists.
   // Result should not be stored.
-  virtual AppLaunchController* GetAppLaunchController() = 0;
+  virtual KioskLaunchController* GetKioskLaunchController() = 0;
 
   // Starts screen for adding user into session.
   // |completion_callback| is invoked after login display host shutdown.

chrome/browser/chromeos/login/ui/login_display_host_common.cc

@@ -86,10 +86,8 @@ void LoginDisplayHostCommon::FinalizeImmediately() {
   delete this;
 }
 
-AppLaunchController* LoginDisplayHostCommon::GetAppLaunchController() {
-  // TODO(crbug.com/1046364): Some places are still using legacy
-  // AppLaunchController. Remove casting after they are changed.
-  return reinterpret_cast<AppLaunchController*>(app_launch_controller_.get());
+KioskLaunchController* LoginDisplayHostCommon::GetKioskLaunchController() {
+  return app_launch_controller_.get();
 }
 
 void LoginDisplayHostCommon::StartUserAdding(

chrome/browser/chromeos/login/ui/login_display_host_common.h

@@ -22,7 +22,6 @@ class AccountId;
 namespace chromeos {
 
 class DemoAppLauncher;
-class KioskLaunchController;
 
 // LoginDisplayHostCommon contains code which is not specific to a particular UI
 // implementation - the goal is to reduce code duplication between
@@ -38,7 +37,7 @@ class LoginDisplayHostCommon : public LoginDisplayHost,
   void BeforeSessionStart() final;
   void Finalize(base::OnceClosure completion_callback) final;
   void FinalizeImmediately() final;
-  AppLaunchController* GetAppLaunchController() final;
+  KioskLaunchController* GetKioskLaunchController() final;
   void StartUserAdding(base::OnceClosure completion_callback) final;
   void StartSignInScreen() final;
   void PrewarmAuthentication() final;

chrome/browser/chromeos/login/ui/mock_login_display_host.h

@@ -42,7 +42,7 @@ class MockLoginDisplayHost : public LoginDisplayHost {
   MOCK_METHOD(void, SetStatusAreaVisible, (bool), (override));
   MOCK_METHOD(void, StartWizard, (OobeScreenId), (override));
   MOCK_METHOD(WizardController*, GetWizardController, (), (override));
-  MOCK_METHOD(AppLaunchController*, GetAppLaunchController, (), (override));
+  MOCK_METHOD(KioskLaunchController*, GetKioskLaunchController, (), (override));
 
   // Workaround for move-only args in GMock.
   MOCK_METHOD(void, MockStartUserAdding, (base::OnceClosure*));

chrome/browser/chromeos/login/web_kiosk_browsertest.cc

@@ -45,8 +45,8 @@ class WebKioskTest : public OobeBaseTest {
     set_exit_when_last_browser_closes(false);
     needs_background_networking_ = true;
     skip_splash_wait_override_ =
-        WebKioskController::SkipSplashScreenWaitForTesting();
-    network_wait_override_ = WebKioskController::SetNetworkWaitForTesting(
+        KioskLaunchController::SkipSplashScreenWaitForTesting();
+    network_wait_override_ = KioskLaunchController::SetNetworkWaitForTesting(
         base::TimeDelta::FromSeconds(0));
   }
 
@@ -98,7 +98,7 @@ class WebKioskTest : public OobeBaseTest {
   void SetBlockAppLaunch(bool block) {
     if (block)
       block_app_launch_override_ =
-          WebKioskController::BlockAppLaunchForTesting();
+          KioskLaunchController::BlockAppLaunchForTesting();
     else
       block_app_launch_override_.reset();
   }