Remove retail mode.

components/user_manager/user_manager_base.cc

Index: components/user_manager/user_manager_base.cc
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index abd329c43327cf3e21c76f98af9de767c9d827e8..0f0fe26c01b97248c309ed1863c45eef2a44bcec 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -181,8 +181,6 @@ void UserManagerBase::UserLoggedIn(const std::string& user_id,
 
   if (user_id == chromeos::login::kGuestUserName) {
     GuestUserLoggedIn();
-  } else if (user_id == chromeos::login::kRetailModeUserName) {
-    RetailModeUserLoggedIn();
   } else if (IsKioskApp(user_id)) {
     KioskAppLoggedIn(user_id);
   } else if (IsDemoApp(user_id)) {
@@ -556,11 +554,6 @@ bool UserManagerBase::IsLoggedInAsRegularUser() const {
   return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_REGULAR;
 }
 
-bool UserManagerBase::IsLoggedInAsDemoUser() const {
-  DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_RETAIL_MODE;
-}
-
 bool UserManagerBase::IsLoggedInAsPublicAccount() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return IsUserLoggedIn() &&
@@ -595,10 +588,9 @@ bool UserManagerBase::IsSessionStarted() const {
 
 bool UserManagerBase::IsUserNonCryptohomeDataEphemeral(
     const std::string& user_id) const {
-  // Data belonging to the guest, retail mode and stub users is always
+  // Data belonging to the guest and stub users is always

[bartfab (slow), 2014/10/15 09:52:21]

Nit: The entire comment fits on one line now.

[rkc, 2014/11/20 21:06:34]

Done.

   // ephemeral.
   if (user_id == chromeos::login::kGuestUserName ||
-      user_id == chromeos::login::kRetailModeUserName ||
       user_id == chromeos::login::kStubUser) {
     return true;
   }
@@ -973,8 +965,6 @@ void UserManagerBase::UpdateLoginState() {
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_OWNER;
   else if (active_user_->GetType() == USER_TYPE_GUEST)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_GUEST;
-  else if (active_user_->GetType() == USER_TYPE_RETAIL_MODE)
-    login_user_type = chromeos::LoginState::LOGGED_IN_USER_RETAIL_MODE;
   else if (active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT;
   else if (active_user_->GetType() == USER_TYPE_SUPERVISED)