Move *UserLoggedIn methods from UserManager to UserManagerImpl

This CL trims down the UserManager interfaces by moving the *UserLogged
methods that are really just implementation details to UserManagerImpl.

BUG=None
TEST=Manual and browser/unit tests

Review URL: https://chromiumcodereview.appspot.com/14069017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194938 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/existing_user_controller.cc

@@ -782,9 +782,12 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
       host_ = NULL;
     } else {
 #endif
-      ActivateWizard(WizardController::IsDeviceRegistered() ?
-          WizardController::kTermsOfServiceScreenName :
-          WizardController::kRegistrationScreenName);
+      // Mark the device as registered., i.e. the second part of OOBE as
+      // completed.
+      if (!WizardController::IsDeviceRegistered())
+        WizardController::MarkDeviceRegistered();
+
+      ActivateWizard(WizardController::kTermsOfServiceScreenName);
 #ifndef NDEBUG
     }
 #endif
@@ -805,17 +808,12 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
 void ExistingUserController::OnOffTheRecordLoginSuccess() {
   is_login_in_progress_ = false;
   offline_failed_ = false;
-  if (WizardController::IsDeviceRegistered()) {
-    LoginUtils::Get()->CompleteOffTheRecordLogin(guest_mode_url_);
-  } else {
-    // Postpone CompleteOffTheRecordLogin until registration completion.
-    // TODO(nkostylev): Kind of hack. We have to instruct UserManager here
-    // that we're actually logged in as Guest user as we'll ask UserManager
-    // later in the code path whether we've signed in as Guest and depending
-    // on that would either show image screen or call CompleteOffTheRecordLogin.
-    UserManager::Get()->GuestUserLoggedIn();
-    ActivateWizard(WizardController::kRegistrationScreenName);
-  }
+
+  // Mark the device as registered., i.e. the second part of OOBE as completed.
+  if (!WizardController::IsDeviceRegistered())
+    WizardController::MarkDeviceRegistered();
+
+  LoginUtils::Get()->CompleteOffTheRecordLogin(guest_mode_url_);
 
   if (login_status_consumer_)
     login_status_consumer_->OnOffTheRecordLoginSuccess();
@@ -896,12 +894,7 @@ void ExistingUserController::OnOnlineChecked(const std::string& username,
 // ExistingUserController, private:
 
 void ExistingUserController::ActivateWizard(const std::string& screen_name) {
-  DictionaryValue* params = NULL;
-  if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
-    params = new DictionaryValue;
-    params->SetString("start_url", guest_mode_url_.spec());
-  }
-  host_->StartWizard(screen_name, params);
+  host_->StartWizard(screen_name, NULL);
 }
 
 void ExistingUserController::ConfigurePublicSessionAutoLogin() {

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -66,7 +66,6 @@
 
 using ::testing::_;
 using ::testing::AnyNumber;
-using ::testing::AnyOf;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
@@ -398,14 +397,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
   EXPECT_CALL(*mock_login_display_host_,
               StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
       .Times(0);
-  // This will be the first sign-in of a new user, which may cause the (legacy)
-  // registration to be activated. A real WizardController instance immediately
-  // advances to the Terms of Service or user image screen but this test uses
-  // MockLoginDisplayHost Instead.
   EXPECT_CALL(*mock_login_display_host_,
-              StartWizard(AnyOf(WizardController::kRegistrationScreenName,
-                                WizardController::kTermsOfServiceScreenName),
-                          NULL))
+              StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
       .Times(1);
   EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
       .Times(1)

chrome/browser/chromeos/login/login_utils.cc

@@ -712,8 +712,6 @@ void LoginUtilsImpl::RespectLocalePreference(Profile* profile) {
 void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
   VLOG(1) << "Completing incognito login";
 
-  UserManager::Get()->GuestUserLoggedIn();
-
   // For guest session we ask session manager to restart Chrome with --bwsi
   // flag. We keep only some of the arguments of this process.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();

chrome/browser/chromeos/login/mock_user_manager.h

@@ -29,13 +29,6 @@ class MockUserManager : public UserManager {
   MOCK_METHOD3(UserLoggedIn, void(
       const std::string&, const std::string&, bool));
   MOCK_METHOD1(SwitchActiveUser, void(const std::string& email));
-  MOCK_METHOD0(RetailModeUserLoggedIn, void(void));
-  MOCK_METHOD0(GuestUserLoggedIn, void(void));
-  MOCK_METHOD1(KioskAppLoggedIn, void(const std::string& app_id));
-  MOCK_METHOD1(LocallyManagedUserLoggedIn, void(const std::string&));
-  MOCK_METHOD1(PublicAccountUserLoggedIn, void(User*));
-  MOCK_METHOD2(RegularUserLoggedIn, void(const std::string&, bool));
-  MOCK_METHOD1(RegularUserLoggedInAsEphemeral, void(const std::string&));
   MOCK_METHOD0(SessionStarted, void(void));
   MOCK_METHOD2(RemoveUser, void(const std::string&, RemoveUserDelegate*));
   MOCK_METHOD1(RemoveUserFromList, void(const std::string&));

chrome/browser/chromeos/login/user_manager.h

@@ -110,28 +110,6 @@ class UserManager {
   // Switches to active user identified by |email|. User has to be logged in.
   virtual void SwitchActiveUser(const std::string& email) = 0;
 
-  // Indicates that user just logged on as the retail mode user.
-  virtual void RetailModeUserLoggedIn() = 0;
-
-  // Indicates that user just started incognito session.
-  virtual void GuestUserLoggedIn() = 0;
-
-  // Indicates that a kiosk app robot just logged in.
-  virtual void KioskAppLoggedIn(const std::string& app_id) = 0;
-
-  // Indicates that a locally managed user just logged in.
-  virtual void LocallyManagedUserLoggedIn(const std::string& username) = 0;
-
-  // Indicates that a user just logged into a public account.
-  virtual void PublicAccountUserLoggedIn(User* user) = 0;
-
-  // Indicates that a regular user just logged in.
-  virtual void RegularUserLoggedIn(const std::string& email,
-                                   bool browser_restart) = 0;
-
-  // Indicates that a regular user just logged in as ephemeral.
-  virtual void RegularUserLoggedInAsEphemeral(const std::string& email) = 0;
-
   // Called when browser session is started i.e. after
   // browser_creator.LaunchBrowser(...) was called after user sign in.
   // When user is at the image screen IsUserLoggedIn() will return true

chrome/browser/chromeos/login/user_manager_impl.h

@@ -51,15 +51,6 @@ class UserManagerImpl
                             const std::string& username_hash,
                             bool browser_restart) OVERRIDE;
   virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
-  virtual void RetailModeUserLoggedIn() OVERRIDE;
-  virtual void GuestUserLoggedIn() OVERRIDE;
-  virtual void KioskAppLoggedIn(const std::string& username) OVERRIDE;
-  virtual void LocallyManagedUserLoggedIn(const std::string& username) OVERRIDE;
-  virtual void PublicAccountUserLoggedIn(User* user) OVERRIDE;
-  virtual void RegularUserLoggedIn(const std::string& email,
-                                   bool browser_restart) OVERRIDE;
-  virtual void RegularUserLoggedInAsEphemeral(
-      const std::string& email) OVERRIDE;
   virtual void SessionStarted() OVERRIDE;
   virtual void RemoveUser(const std::string& email,
                           RemoveUserDelegate* delegate) OVERRIDE;
@@ -173,6 +164,27 @@ class UserManagerImpl
   // Same as FindUserInList but returns non-const pointer to User object.
   User* FindUserInListAndModify(const std::string& email);
 
+  // Indicates that a user just logged in as guest.
+  void GuestUserLoggedIn();
+
+  // Indicates that a regular user just logged in.
+  void RegularUserLoggedIn(const std::string& email, bool browser_restart);
+
+  // Indicates that a regular user just logged in as ephemeral.
+  void RegularUserLoggedInAsEphemeral(const std::string& email);
+
+  // Indicates that a locally managed user just logged in.
+  void LocallyManagedUserLoggedIn(const std::string& username);
+
+  // Indicates that a user just logged into a public session.
+  void PublicAccountUserLoggedIn(User* user);
+
+  // Indicates that a kiosk app robot just logged in.
+  void KioskAppLoggedIn(const std::string& app_id);
+
+  // Indicates that a user just logged into a retail mode session.
+  void RetailModeUserLoggedIn();
+
   // Notifies that user has logged in.
   // Sends NOTIFICATION_LOGIN_USER_CHANGED notification.
   void NotifyOnLogin();

chrome/browser/chromeos/login/wizard_controller.cc

@@ -114,7 +114,6 @@ const char WizardController::kLoginScreenName[] = "login";
 const char WizardController::kUpdateScreenName[] = "update";
 const char WizardController::kUserImageScreenName[] = "image";
 const char WizardController::kEulaScreenName[] = "eula";
-const char WizardController::kRegistrationScreenName[] = "register";
 const char WizardController::kEnterpriseEnrollmentScreenName[] = "enroll";
 const char WizardController::kResetScreenName[] = "reset";
 const char WizardController::kErrorScreenName[] = "error-message";
@@ -533,21 +532,6 @@ void WizardController::OnUserImageSkipped() {
   OnUserImageSelected();
 }
 
-void WizardController::OnRegistrationSuccess() {
-  MarkDeviceRegistered();
-  if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
-    std::string spec;
-    GURL start_url;
-    if (screen_parameters_.get() &&
-        screen_parameters_->GetString("start_url", &spec)) {
-      start_url = GURL(spec);
-    }
-    chromeos::LoginUtils::Get()->CompleteOffTheRecordLogin(start_url);
-  } else {
-    ShowTermsOfServiceScreen();
-  }
-}
-
 void WizardController::OnEnterpriseEnrollmentDone() {
   ShowLoginScreen();
 }
@@ -674,9 +658,6 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
     ShowUserImageScreen();
   } else if (screen_name == kEulaScreenName) {
     ShowEulaScreen();
-  } else if (screen_name == kRegistrationScreenName) {
-    // Just proceed to next stage.
-    OnRegistrationSuccess();
   } else if (screen_name == kResetScreenName) {
     ShowResetScreen();
   } else if (screen_name == kEnterpriseEnrollmentScreenName) {

chrome/browser/chromeos/login/wizard_controller.h

@@ -157,8 +157,6 @@ class WizardController : public ScreenObserver {
   static const char kLoginScreenName[];
   static const char kUpdateScreenName[];
   static const char kUserImageScreenName[];
-  // Not a real screen, just a placeholder for OOBE final stage.
-  static const char kRegistrationScreenName[];
   static const char kOutOfBoxScreenName[];
   static const char kTestNoScreenName[];
   static const char kEulaScreenName[];
@@ -197,8 +195,6 @@ class WizardController : public ScreenObserver {
   void OnUpdateErrorUpdating();
   void OnUserImageSelected();
   void OnUserImageSkipped();
-  void OnRegistrationSuccess();
-  void OnRegistrationSkipped();
   void OnEnterpriseEnrollmentDone();
   void OnEnterpriseAutoEnrollmentDone();
   void OnResetCanceled();