New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index 4df33d8e9b2d9a16b60dda8e7ebf6952b7591903..ce650c56f90f08bde916b8e328e1da5aad55d7f0 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -33,7 +33,6 @@
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_manager.h"
-#include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "policy/policy_constants.h"
@@ -610,7 +609,7 @@ void UserImageManagerImpl::UserLoggedIn(bool user_is_new,
   profile_image_url_ = GURL();
   profile_image_requested_ = false;
 
-  if (IsUserLoggedInAndRegular()) {
+  if (IsUserLoggedInAndHasGaiaAccount()) {
     TryToInitDownloadedProfileImage();
 
     // Schedule an initial download of the profile data (full name and
@@ -891,14 +890,13 @@ void UserImageManagerImpl::TryToInitDownloadedProfileImage() {
 
 bool UserImageManagerImpl::NeedProfileImage() const {
   const user_manager::User* user = GetUser();
-  return IsUserLoggedInAndRegular() &&
+  return IsUserLoggedInAndHasGaiaAccount() &&
          (user->image_index() == user_manager::User::USER_IMAGE_PROFILE ||
           profile_image_requested_);
 }
 
 void UserImageManagerImpl::DownloadProfileData(const std::string& reason) {
-  // GAIA profiles exist for regular users only.
-  if (!IsUserLoggedInAndRegular())
+  if (!IsUserLoggedInAndHasGaiaAccount())
     return;
 
   // If a download is already in progress, allow it to continue, with one
@@ -1019,12 +1017,11 @@ user_manager::User* UserImageManagerImpl::GetUserAndModify() const {
   return user_manager_->FindUserAndModify(user_id());
 }
 
-bool UserImageManagerImpl::IsUserLoggedInAndRegular() const {
+bool UserImageManagerImpl::IsUserLoggedInAndHasGaiaAccount() const {
   const user_manager::User* user = GetUser();
   if (!user)
     return false;
-  return user->is_logged_in() &&
-         user->GetType() == user_manager::USER_TYPE_REGULAR;
+  return user->is_logged_in() && user->HasGaiaAccount();
 }
 
 }  // namespace chromeos