cros: Move views for DemoSetup, Discover, Eula, Gaia, and Reset

TBR=xiyuan@chromium.org
TBR=rsorokin@chromium.org

Bug: 928555
Change-Id: Iae26e383c7fe81cbd5a0bf638c432bf1947f77da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572234
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652607}

chrome/browser/chromeos/BUILD.gn

@@ -1273,14 +1273,11 @@ source_set("chromeos") {
     "login/screens/demo_preferences_screen.h",
     "login/screens/demo_setup_screen.cc",
     "login/screens/demo_setup_screen.h",
-    "login/screens/demo_setup_screen_view.cc",
-    "login/screens/demo_setup_screen_view.h",
     "login/screens/device_disabled_screen.cc",
     "login/screens/device_disabled_screen.h",
     "login/screens/device_disabled_screen_view.h",
     "login/screens/discover_screen.cc",
     "login/screens/discover_screen.h",
-    "login/screens/discover_screen_view.h",
     "login/screens/enable_debugging_screen.cc",
     "login/screens/enable_debugging_screen.h",
     "login/screens/enable_debugging_screen_view.h",
@@ -1291,13 +1288,11 @@ source_set("chromeos") {
     "login/screens/error_screen.h",
     "login/screens/eula_screen.cc",
     "login/screens/eula_screen.h",
-    "login/screens/eula_view.h",
     "login/screens/fingerprint_setup_screen.cc",
     "login/screens/fingerprint_setup_screen.h",
     "login/screens/fingerprint_setup_screen_view.h",
     "login/screens/gaia_screen.cc",
     "login/screens/gaia_screen.h",
-    "login/screens/gaia_view.h",
     "login/screens/hid_detection_screen.cc",
     "login/screens/hid_detection_screen.h",
     "login/screens/hid_detection_view.h",
@@ -1329,7 +1324,6 @@ source_set("chromeos") {
     "login/screens/recommend_apps_screen_view.h",
     "login/screens/reset_screen.cc",
     "login/screens/reset_screen.h",
-    "login/screens/reset_view.h",
     "login/screens/supervision_transition_screen.cc",
     "login/screens/supervision_transition_screen.h",
     "login/screens/supervision_transition_screen_view.h",

chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -14,11 +14,11 @@
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.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/wizard_controller.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

chrome/browser/chromeos/login/oobe_browsertest.cc

@@ -9,13 +9,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"

chrome/browser/chromeos/login/oobe_interactive_ui_test.cc

@@ -10,7 +10,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/update_engine_client.h"

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

@@ -30,7 +30,6 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/device_state_mixin.h"
 #include "chrome/browser/chromeos/login/test/enrollment_ui_mixin.h"
@@ -52,6 +51,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/signin/signin_utils.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"

chrome/browser/chromeos/login/screens/demo_setup_screen.cc

@@ -5,8 +5,8 @@
 #include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/login/screens/demo_setup_screen_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
 #include "chromeos/dbus/session_manager/session_manager_client.h"
 
 namespace {

chrome/browser/chromeos/login/screens/demo_setup_screen_view.cc

-// Copyright 2018 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/chromeos/login/screens/demo_setup_screen_view.h"
-
-namespace chromeos {
-
-DemoSetupScreenView::~DemoSetupScreenView() = default;
-
-}  // namespace chromeos

chrome/browser/chromeos/login/screens/demo_setup_screen_view.h

-// Copyright 2018 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEMO_SETUP_SCREEN_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEMO_SETUP_SCREEN_VIEW_H_
-
-#include <string>
-
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
-#include "chrome/browser/chromeos/login/oobe_screen.h"
-
-namespace chromeos {
-
-class DemoSetupScreen;
-
-// Interface of the demo mode setup screen view.
-class DemoSetupScreenView {
- public:
-  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_DEMO_SETUP;
-
-  virtual ~DemoSetupScreenView();
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-
-  // Sets view and screen.
-  virtual void Bind(DemoSetupScreen* screen) = 0;
-
-  // Handles successful setup.
-  virtual void OnSetupSucceeded() = 0;
-
-  // Handles setup failure.
-  virtual void OnSetupFailed(
-      const DemoSetupController::DemoSetupError& error) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEMO_SETUP_SCREEN_VIEW_H_

chrome/browser/chromeos/login/screens/discover_screen.cc

@@ -6,10 +6,10 @@
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
-#include "chrome/browser/chromeos/login/screens/discover_screen_view.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
+#include "chrome/browser/ui/webui/chromeos/login/discover_screen_handler.h"
 #include "components/prefs/pref_service.h"
 
 namespace chromeos {

chrome/browser/chromeos/login/screens/discover_screen_view.h

-// Copyright 2018 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DISCOVER_SCREEN_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DISCOVER_SCREEN_VIEW_H_
-
-#include "chrome/browser/chromeos/login/oobe_screen.h"
-
-namespace chromeos {
-
-class DiscoverScreen;
-
-// Interface for dependency injection between DiscoverScreen and its
-// WebUI representation.
-class DiscoverScreenView {
- public:
-  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_DISCOVER;
-
-  virtual ~DiscoverScreenView() = default;
-
-  // Sets screen this view belongs to.
-  virtual void Bind(DiscoverScreen* screen) = 0;
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DISCOVER_SCREEN_VIEW_H_

chrome/browser/chromeos/login/screens/eula_screen.cc

@@ -9,8 +9,8 @@
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/screens/eula_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chromeos/dbus/cryptohome/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

chrome/browser/chromeos/login/screens/eula_view.h

-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_VIEW_H_
-
-#include <string>
-#include "chrome/browser/chromeos/login/oobe_screen.h"
-
-namespace chromeos {
-
-class EulaScreen;
-
-// Interface between eula screen and its representation, either WebUI
-// or Views one. Note, do not forget to call OnViewDestroyed in the
-// dtor.
-class EulaView {
- public:
-  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_EULA;
-
-  virtual ~EulaView() {}
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void Bind(EulaScreen* screen) = 0;
-  virtual void Unbind() = 0;
-  virtual void OnPasswordFetched(const std::string& tpm_password) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_VIEW_H_

chrome/browser/chromeos/login/screens/gaia_screen.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 namespace chromeos {
 

chrome/browser/chromeos/login/screens/gaia_view.h

-// Copyright 2017 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_
-
-#include <string>
-
-#include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/optional.h"
-#include "chrome/browser/chromeos/login/oobe_screen.h"
-
-class AccountId;
-
-namespace chromeos {
-
-class GaiaView {
- public:
-  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_GAIA_SIGNIN;
-
-  GaiaView() = default;
-  virtual ~GaiaView() = default;
-
-  // Decides whether an auth extension should be pre-loaded. If it should,
-  // pre-loads it.
-  virtual void MaybePreloadAuthExtension() = 0;
-
-  virtual void DisableRestrictiveProxyCheckForTest() = 0;
-
-  // Show the sign-in screen. Depending on internal state, the screen will
-  // either be shown immediately or after an asynchronous clean-up process that
-  // cleans DNS cache and cookies. If available, |account_id| is used for
-  // prefilling information.
-  virtual void ShowGaiaAsync(const base::Optional<AccountId>& account_id) = 0;
-
-  // Show sign-in screen for the given credentials. |services| is a list of
-  // services returned by userInfo call as JSON array. Should be an empty array
-  // for a regular user: "[]".
-  virtual void ShowSigninScreenForTest(const std::string& username,
-                                       const std::string& password,
-                                       const std::string& services) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GaiaView);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_

chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h

@@ -7,7 +7,7 @@
 
 #include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
 #include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
-#include "chrome/browser/chromeos/login/screens/demo_setup_screen_view.h"
+#include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {

chrome/browser/chromeos/login/screens/mock_eula_screen.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_EULA_SCREEN_H_
 
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
-#include "chrome/browser/chromeos/login/screens/eula_view.h"
+#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {

chrome/browser/chromeos/login/screens/reset_screen.cc

@@ -12,10 +12,10 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_error.h"
-#include "chrome/browser/chromeos/login/screens/reset_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/reset/metrics.h"
 #include "chrome/browser/chromeos/tpm_firmware_update.h"
+#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

chrome/browser/chromeos/login/screens/reset_view.h

-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RESET_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RESET_VIEW_H_
-
-#include "chrome/browser/chromeos/login/oobe_screen.h"
-
-namespace chromeos {
-
-namespace tpm_firmware_update {
-enum class Mode;
-}
-
-class ResetScreen;
-
-// Interface for dependency injection between ResetScreen and its actual
-// representation, either views based or WebUI.
-class ResetView {
- public:
-  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_RESET;
-
-  virtual ~ResetView() {}
-
-  virtual void Bind(ResetScreen* screen) = 0;
-  virtual void Unbind() = 0;
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-
-  enum class State {
-    kRestartRequired = 0,
-    kRevertPromise,
-    kPowerwashProposal,
-    kError,
-  };
-
-  virtual void SetIsRollbackAvailable(bool value) = 0;
-  virtual void SetIsRollbackChecked(bool value) = 0;
-  virtual void SetIsTpmFirmwareUpdateAvailable(bool value) = 0;
-  virtual void SetIsTpmFirmwareUpdateChecked(bool value) = 0;
-  virtual void SetIsTpmFirmwareUpdateEditable(bool value) = 0;
-  virtual void SetTpmFirmwareUpdateMode(tpm_firmware_update::Mode value) = 0;
-  virtual void SetIsConfirmational(bool value) = 0;
-  virtual void SetIsOfficialBuild(bool value) = 0;
-  virtual void SetScreenState(State value) = 0;
-
-  virtual State GetScreenState() = 0;
-  virtual tpm_firmware_update::Mode GetTpmFirmwareUpdateMode() = 0;
-  virtual bool GetIsRollbackAvailable() = 0;
-  virtual bool GetIsRollbackChecked() = 0;
-  virtual bool GetIsTpmFirmwareUpdateChecked() = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_RESET_VIEW_H_

chrome/browser/chromeos/login/session/chrome_session_manager_browsertest.cc

@@ -11,7 +11,6 @@
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/google/google_brand_chromeos.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/constants/chromeos_switches.h"

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

@@ -9,7 +9,6 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/chrome_device_id_helper.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/constants/chromeos_switches.h"

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

@@ -19,7 +19,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/signin_specifics.h"
@@ -39,6 +38,7 @@
 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/chromeos/login/sync_consent_interactive_ui_test.cc

@@ -9,7 +9,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_service.h"

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

@@ -12,13 +12,13 @@
 #include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
 #include "chrome/browser/ui/ash/wallpaper_controller_client.h"
 #include "chrome/browser/ui/webui/chromeos/internet_detail_dialog.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "components/keep_alive_registry/keep_alive_types.h"
 #include "components/keep_alive_registry/scoped_keep_alive.h"
 #include "ui/base/ui_base_features.h"

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

@@ -13,13 +13,13 @@
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/mojo_system_info_dispatcher.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/ui/login_display_mojo.h"
 #include "chrome/browser/chromeos/login/user_board_view_mojo.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/ash/wallpaper_controller_client.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/auth/user_context.h"

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

@@ -37,7 +37,6 @@
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_mojo.h"
@@ -57,6 +56,7 @@
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"

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

@@ -7,7 +7,6 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/account_id/account_id.h"

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

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "ash/public/cpp/shell_window_ids.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_mojo.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/chromeos/policy/blocking_login_browsertest.cc

@@ -11,11 +11,11 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.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/wizard_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"

chrome/browser/chromeos/policy/login_policy_test_base.cc

@@ -6,11 +6,11 @@
 
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_webui.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/user_policy_test_helper.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"

chrome/browser/chromeos/policy/site_isolation_flag_handling_browsertest.cc

@@ -13,7 +13,6 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager_test_api.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/scoped_testing_cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/constants/chromeos_switches.h"

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc

@@ -12,7 +12,6 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/child_accounts/child_account_test_utils.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/policy/login_policy_test_base.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_features.h"
 #include "components/arc/arc_features.h"

chrome/browser/chromeos/policy/user_network_configuration_updater_factory_browsertest.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/test/local_policy_test_server_mixin.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -27,6 +26,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/constants/chromeos_switches.h"

chrome/browser/ui/ash/kiosk_next_shell_client_browsertest.cc

@@ -10,7 +10,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/ui/ash/kiosk_next_shell_client.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/prefs/pref_service.h"

chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc

@@ -14,6 +14,8 @@
 
 namespace chromeos {
 
+DemoSetupScreenView::~DemoSetupScreenView() = default;
+
 DemoSetupScreenHandler::DemoSetupScreenHandler(
     JSCallsContainer* js_calls_container)
     : BaseScreenHandler(kScreenId, js_calls_container) {

chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h

@@ -6,13 +6,36 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEMO_SETUP_SCREEN_HANDLER_H_
 
 #include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
-#include "chrome/browser/chromeos/login/screens/demo_setup_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
 class DemoSetupScreen;
 
+// Interface of the demo mode setup screen view.
+class DemoSetupScreenView {
+ public:
+  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_DEMO_SETUP;
+
+  virtual ~DemoSetupScreenView();
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+
+  // Sets view and screen.
+  virtual void Bind(DemoSetupScreen* screen) = 0;
+
+  // Handles successful setup.
+  virtual void OnSetupSucceeded() = 0;
+
+  // Handles setup failure.
+  virtual void OnSetupFailed(
+      const DemoSetupController::DemoSetupError& error) = 0;
+};
+
 // WebUI implementation of DemoSetupScreenView. It controlls UI, receives UI
 // events and notifies the Delegate.
 class DemoSetupScreenHandler : public BaseScreenHandler,

chrome/browser/ui/webui/chromeos/login/discover_screen_handler.h

@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DISCOVER_SCREEN_HANDLER_H_
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/discover_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/discover/discover_ui.h"
 
@@ -14,6 +13,24 @@ namespace chromeos {
 
 class DiscoverScreen;
 
+// Interface for dependency injection between DiscoverScreen and its
+// WebUI representation.
+class DiscoverScreenView {
+ public:
+  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_DISCOVER;
+
+  virtual ~DiscoverScreenView() = default;
+
+  // Sets screen this view belongs to.
+  virtual void Bind(DiscoverScreen* screen) = 0;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+};
+
 // The sole implementation of the DiscoverScreenView, using WebUI.
 class DiscoverScreenHandler : public BaseScreenHandler,
                               public DiscoverScreenView {

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h

@@ -8,7 +8,6 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/login/screens/eula_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "components/login/secure_module_util_chromeos.h"
 #include "content/public/browser/web_ui.h"
@@ -20,8 +19,25 @@ class DictionaryValue;
 namespace chromeos {
 
 class CoreOobeView;
+class EulaScreen;
 class HelpAppLauncher;
 
+// Interface between eula screen and its representation, either WebUI
+// or Views one. Note, do not forget to call OnViewDestroyed in the
+// dtor.
+class EulaView {
+ public:
+  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_EULA;
+
+  virtual ~EulaView() {}
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void Bind(EulaScreen* screen) = 0;
+  virtual void Unbind() = 0;
+  virtual void OnPasswordFetched(const std::string& tpm_password) = 0;
+};
+
 // WebUI implementation of EulaScreenView. It is used to interact
 // with the eula part of the JS page.
 class EulaScreenHandler : public EulaView, public BaseScreenHandler {

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

@@ -13,7 +13,6 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/authpolicy/authpolicy_helper.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
-#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
@@ -35,6 +34,36 @@ class ActiveDirectoryPasswordChangeScreenHandler;
 class Key;
 class SigninScreenHandler;
 
+class GaiaView {
+ public:
+  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_GAIA_SIGNIN;
+
+  GaiaView() = default;
+  virtual ~GaiaView() = default;
+
+  // Decides whether an auth extension should be pre-loaded. If it should,
+  // pre-loads it.
+  virtual void MaybePreloadAuthExtension() = 0;
+
+  virtual void DisableRestrictiveProxyCheckForTest() = 0;
+
+  // Show the sign-in screen. Depending on internal state, the screen will
+  // either be shown immediately or after an asynchronous clean-up process that
+  // cleans DNS cache and cookies. If available, |account_id| is used for
+  // prefilling information.
+  virtual void ShowGaiaAsync(const base::Optional<AccountId>& account_id) = 0;
+
+  // Show sign-in screen for the given credentials. |services| is a list of
+  // services returned by userInfo call as JSON array. Should be an empty array
+  // for a regular user: "[]".
+  virtual void ShowSigninScreenForTest(const std::string& username,
+                                       const std::string& password,
+                                       const std::string& services) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(GaiaView);
+};
+
 // A class that handles WebUI hooks in Gaia screen.
 class GaiaScreenHandler : public BaseScreenHandler,
                           public GaiaView,

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -25,7 +25,6 @@
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
-#include "chrome/browser/chromeos/login/screens/demo_setup_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/fingerprint_setup_screen_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"

chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h

@@ -7,13 +7,51 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/reset_view.h"
 #include "chrome/browser/chromeos/tpm_firmware_update.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "content/public/browser/web_ui.h"
 
 namespace chromeos {
 
+class ResetScreen;
+
+// Interface for dependency injection between ResetScreen and its actual
+// representation, either views based or WebUI.
+class ResetView {
+ public:
+  constexpr static OobeScreen kScreenId = OobeScreen::SCREEN_OOBE_RESET;
+
+  virtual ~ResetView() {}
+
+  virtual void Bind(ResetScreen* screen) = 0;
+  virtual void Unbind() = 0;
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+
+  enum class State {
+    kRestartRequired = 0,
+    kRevertPromise,
+    kPowerwashProposal,
+    kError,
+  };
+
+  virtual void SetIsRollbackAvailable(bool value) = 0;
+  virtual void SetIsRollbackChecked(bool value) = 0;
+  virtual void SetIsTpmFirmwareUpdateAvailable(bool value) = 0;
+  virtual void SetIsTpmFirmwareUpdateChecked(bool value) = 0;
+  virtual void SetIsTpmFirmwareUpdateEditable(bool value) = 0;
+  virtual void SetTpmFirmwareUpdateMode(tpm_firmware_update::Mode value) = 0;
+  virtual void SetIsConfirmational(bool value) = 0;
+  virtual void SetIsOfficialBuild(bool value) = 0;
+  virtual void SetScreenState(State value) = 0;
+
+  virtual State GetScreenState() = 0;
+  virtual tpm_firmware_update::Mode GetTpmFirmwareUpdateMode() = 0;
+  virtual bool GetIsRollbackAvailable() = 0;
+  virtual bool GetIsRollbackChecked() = 0;
+  virtual bool GetIsTpmFirmwareUpdateChecked() = 0;
+};
+
 // WebUI implementation of ResetScreenActor.
 class ResetScreenHandler : public ResetView,
                            public BaseScreenHandler {