New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 337 matching lines @@
           device_local_account_policy_service_->AddObserver(this);
       }
       RetrieveTrustedDevicePolicies();
       UpdateOwnership();
       break;
     case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
       Profile* profile = content::Details<Profile>(details).ptr();
       if (IsUserLoggedIn() && !IsLoggedInAsGuest() && !IsLoggedInAsKioskApp()) {
         if (IsLoggedInAsSupervisedUser())
           SupervisedUserPasswordServiceFactory::GetForProfile(profile);
-        if (IsLoggedInAsRegularUser())
+        if (IsLoggedInAsUserWithGaiaAccount())
           ManagerPasswordServiceFactory::GetForProfile(profile);
 
         if (!profile->IsOffTheRecord()) {
           AuthSyncObserver* sync_observer =
               AuthSyncObserverFactory::GetInstance()->GetForProfile(profile);
           sync_observer->StartObserving();
           multi_profile_user_controller_->StartObserving(profile);
         }
       }
       break;
@@ skipping 200 matching lines @@
   std::string owner_email;
   cros_settings_->GetString(kDeviceOwner, &owner_email);
   SetOwnerEmail(owner_email);
 
   EnsureUsersLoaded();
 
   bool changed = UpdateAndCleanUpPublicAccounts(
       policy::GetDeviceLocalAccounts(cros_settings_));
 
   // If ephemeral users are enabled and we are on the login screen, take this
   // opportunity to clean up by removing all regular users except the owner.

[bartfab (slow), 2014/11/27 12:51:50]

Nit: s/regular/gaia/

   if (GetEphemeralUsersEnabled() && !IsUserLoggedIn()) {
     ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
     prefs_users_update->Clear();
     for (user_manager::UserList::iterator it = users_.begin();
          it != users_.end();) {
       const std::string user_email = (*it)->email();
-      if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR &&
-          user_email != GetOwnerEmail()) {
+      if ((*it)->HasGaiaAccount() && user_email != GetOwnerEmail()) {
         RemoveNonCryptohomeData(user_email);
         DeleteUser(*it);
         it = users_.erase(it);
         changed = true;
       } else {
         if ((*it)->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)
           prefs_users_update->Append(new base::StringValue(user_email));
         ++it;
       }
     }
@@ skipping 472 matching lines @@
       ash::MultiProfileUMA::RecordUserCount(users);
   }
 #endif
 
   base::debug::SetCrashKeyValue(
       crash_keys::kNumberOfUsers,
       base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
 }
 
 }  // namespace chromeos