cros oobe: remove obsolete parts of SigninScreenController

Eventually this class should go away.
This CL removes obsolete parts
* Gaia screen - flow moved to the Views implementation
* RemoveUserDelegate - ditto

Bug: 1079199, 1067260
Change-Id: I231154e31b49eb5b645cd01b6e4605edb75f05c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2253900
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780278}

chrome/browser/chromeos/login/app_launch_signin_screen.cc

@@ -85,10 +85,6 @@ void AppLaunchSigninScreen::Login(const UserContext& user_context,
 
 void AppLaunchSigninScreen::OnSigninScreenReady() {}
 
-void AppLaunchSigninScreen::RemoveUser(const AccountId& account_id) {
-  NOTREACHED();
-}
-
 void AppLaunchSigninScreen::ShowEnterpriseEnrollmentScreen() {
   NOTREACHED();
 }

chrome/browser/chromeos/login/app_launch_signin_screen.h

@@ -58,7 +58,6 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate,
   void Login(const UserContext& user_context,
              const SigninSpecifics& specifics) override;
   void OnSigninScreenReady() override;
-  void RemoveUser(const AccountId& account_id) override;
   void ShowEnterpriseEnrollmentScreen() override;
   void ShowEnableDebuggingScreen() override;
   void ShowKioskEnableScreen() override;

chrome/browser/chromeos/login/signin_screen_controller.cc

@@ -8,7 +8,6 @@
 #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/ui/views/user_board_view.h"
-#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h"
@@ -17,16 +16,14 @@ namespace chromeos {
 
 SignInScreenController* SignInScreenController::instance_ = nullptr;
 
-SignInScreenController::SignInScreenController(OobeUI* oobe_ui)
-    : oobe_ui_(oobe_ui), gaia_screen_(new GaiaScreen()) {
+SignInScreenController::SignInScreenController(OobeUI* oobe_ui) {
   DCHECK(!instance_);
   instance_ = this;
 
-  gaia_screen_->set_view(oobe_ui_->GetView<GaiaScreenHandler>());
   std::string display_type = oobe_ui->display_type();
   user_selection_screen_.reset(new ChromeUserSelectionScreen(display_type));
 
-  user_board_view_ = oobe_ui_->GetView<UserBoardScreenHandler>()->GetWeakPtr();
+  user_board_view_ = oobe_ui->GetView<UserBoardScreenHandler>()->GetWeakPtr();
   user_selection_screen_->SetView(user_board_view_.get());
   // TODO(jdufault): Bind and Unbind should be controlled by either the
   // Model/View which are then each responsible for automatically unbinding the
@@ -52,22 +49,9 @@ void SignInScreenController::Init(const user_manager::UserList& users) {
 }
 
 void SignInScreenController::OnSigninScreenReady() {
-  gaia_screen_->MaybePreloadAuthExtension();
   user_selection_screen_->InitEasyUnlock();
 }
 
-void SignInScreenController::RemoveUser(const AccountId& account_id) {
-  user_manager::UserManager::Get()->RemoveUser(account_id, this);
-}
-
-void SignInScreenController::OnBeforeUserRemoved(const AccountId& account_id) {
-  user_selection_screen_->OnBeforeUserRemoved(account_id);
-}
-
-void SignInScreenController::OnUserRemoved(const AccountId& account_id) {
-  user_selection_screen_->OnUserRemoved(account_id);
-}
-
 void SignInScreenController::OnUserImageChanged(
     const user_manager::User& user) {
   user_selection_screen_->OnUserImageChanged(user);

chrome/browser/chromeos/login/signin_screen_controller.h

@@ -7,10 +7,8 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 
@@ -19,7 +17,6 @@ class AccountId;
 namespace chromeos {
 
 class LoginDisplayWebUIHandler;
-class OobeUI;
 
 // Class that manages control flow between wizard screens. Wizard controller
 // interacts with screen controllers to move the user between screens.
@@ -27,8 +24,7 @@ class OobeUI;
 // This class is allocated when the signin or lock screen is actually visible to
 // the user. It is a 'per-session' class; SignInScreenHandler, in comparsion, is
 // tied to the WebContents lifetime and therefore may live beyond this class.
-class SignInScreenController : public user_manager::RemoveUserDelegate,
-                               public user_manager::UserManager::Observer {
+class SignInScreenController : public user_manager::UserManager::Observer {
  public:
   explicit SignInScreenController(OobeUI* oobe_ui);
   ~SignInScreenController() override;
@@ -51,26 +47,15 @@ class SignInScreenController : public user_manager::RemoveUserDelegate,
   // Runs OAauth token validity check.
   void CheckUserStatus(const AccountId& account_id);
 
-  // Query to remove user with specified id.
-  // TODO(antrim): move to user selection screen handler.
-  void RemoveUser(const AccountId& account_id);
-
  private:
-  // user_manager::RemoveUserDelegate implementation:
-  void OnBeforeUserRemoved(const AccountId& account_id) override;
-  void OnUserRemoved(const AccountId& account_id) override;
-
   // user_manager::UserManager::Observer implementation:
   void OnUserImageChanged(const user_manager::User& user) override;
 
   static SignInScreenController* instance_;
 
-  OobeUI* oobe_ui_ = nullptr;
-
   // Reference to the WebUI handling layer for the login screen
   LoginDisplayWebUIHandler* webui_handler_ = nullptr;
 
-  std::unique_ptr<GaiaScreen> gaia_screen_;
   std::unique_ptr<UserSelectionScreen> user_selection_screen_;
 
   base::WeakPtr<UserBoardView> user_board_view_;

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

@@ -251,10 +251,6 @@ void LoginDisplayMojo::CancelUserAdding() {
   NOTIMPLEMENTED();
 }
 
-void LoginDisplayMojo::RemoveUser(const AccountId& account_id) {
-  NOTIMPLEMENTED();
-}
-
 void LoginDisplayMojo::SetWebUIHandler(
     LoginDisplayWebUIHandler* webui_handler) {
   webui_handler_ = webui_handler;

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

@@ -60,7 +60,6 @@ class LoginDisplayMojo : public LoginDisplay,
   void ShowWrongHWIDScreen() override;
   void ShowUpdateRequiredScreen() override;
   void CancelUserAdding() override;
-  void RemoveUser(const AccountId& account_id) override;
   void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override;
   bool IsShowGuest() const override;
   bool IsShowUsers() const override;

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

@@ -187,10 +187,6 @@ void LoginDisplayWebUI::OnSigninScreenReady() {
     delegate_->OnSigninScreenReady();
 }
 
-void LoginDisplayWebUI::RemoveUser(const AccountId& account_id) {
-  SignInScreenController::Get()->RemoveUser(account_id);
-}
-
 void LoginDisplayWebUI::ShowEnterpriseEnrollmentScreen() {
   if (delegate_)
     delegate_->OnStartEnterpriseEnrollment();

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

@@ -35,7 +35,6 @@ class LoginDisplayWebUI : public LoginDisplay,
             bool show_users,
             bool allow_new_user) override;
   void OnPreferencesChanged() override;
-  void RemoveUser(const AccountId& account_id) override;
   void SetUIEnabled(bool is_enabled) override;
   void ShowError(int error_msg_id,
                  int login_attempts,

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

@@ -423,7 +423,6 @@ void SigninScreenHandler::RegisterMessages() {
               &SigninScreenHandler::HandleLaunchSAMLPublicSession);
   AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin);
   AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem);
-  AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
   AddCallback("toggleEnrollmentScreen",
               &SigninScreenHandler::HandleToggleEnrollmentScreen);
   AddCallback("toggleEnableDebuggingScreen",
@@ -1097,20 +1096,6 @@ void SigninScreenHandler::HandleRebootSystem() {
       power_manager::REQUEST_RESTART_FOR_USER, "WebUI signin screen");
 }
 
-void SigninScreenHandler::HandleRemoveUser(const AccountId& account_id) {
-  if (delegate_ &&
-      (delegate_->IsUserSigninCompleted() || delegate_->IsSigninInProgress())) {
-    return;
-  }
-
-  ProfileMetrics::LogProfileDeleteUser(
-      ProfileMetrics::DELETE_PROFILE_USER_MANAGER);
-
-  if (!delegate_)
-    return;
-  delegate_->RemoveUser(account_id);
-}
-
 void SigninScreenHandler::HandleToggleEnrollmentScreen() {
   if (delegate_)
     delegate_->ShowEnterpriseEnrollmentScreen();

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

@@ -122,9 +122,6 @@ class SigninScreenHandlerDelegate {
   // Cancels user adding.
   virtual void CancelUserAdding() = 0;
 
-  // Attempts to remove given user.
-  virtual void RemoveUser(const AccountId& account_id) = 0;
-
   // Let the delegate know about the handler it is supposed to be using.
   virtual void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) = 0;
 
@@ -309,7 +306,6 @@ class SigninScreenHandler
                                  const std::string& input_method);
   void HandleOfflineLogin(const base::ListValue* args);
   void HandleRebootSystem();
-  void HandleRemoveUser(const AccountId& account_id);
   void HandleToggleEnrollmentScreen();
   void HandleToggleEnrollmentAd();
   void HandleToggleEnableDebuggingScreen();