New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/session/user_session_manager.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/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 489 matching lines @@
                               enable_layouts,
                               false /* login_layouts_only */,
                               callback.Pass());
 
   return true;
 }
 
 bool UserSessionManager::NeedsToUpdateEasyUnlockKeys() const {
   return EasyUnlockService::IsSignInEnabled() &&
          !user_context_.GetUserID().empty() &&
-         user_context_.GetUserType() == user_manager::USER_TYPE_REGULAR &&
+         user_manager::User::TypeIsRegular(user_context_.GetUserType()) &&
          user_context_.GetKey() && !user_context_.GetKey()->GetSecret().empty();
 }
 
 bool UserSessionManager::CheckEasyUnlockKeyOps(const base::Closure& callback) {
   if (!running_easy_unlock_key_ops_)
     return false;
 
   // Assumes only one deferred callback is needed.
   DCHECK(easy_unlock_key_ops_finished_callback_.is_null());
 
@@ skipping 679 matching lines @@
   // timeout.
   // TODO(xiyuan): Revisit this when adding tests.
   if (!base::SysInfo::IsRunningOnChromeOS())
     return;
 
   // Only update Easy unlock keys for regular user.
   // TODO(xiyuan): Fix inconsistency user type of |user_context| introduced in
   // authenticator.
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(user_context.GetUserID());
-  if (!user || user->GetType() != user_manager::USER_TYPE_REGULAR)
+  if (!user || !user->IsRegular())
     return;
 
   // Bail if |user_context| does not have secret.
   if (user_context.GetKey()->GetSecret().empty())
     return;
 
   const base::ListValue* device_list = NULL;
   EasyUnlockService* easy_unlock_service = EasyUnlockService::GetForUser(*user);
   if (easy_unlock_service) {
     device_list = easy_unlock_service->GetRemoteDevices();
@@ skipping 60 matching lines @@
 }
 
 EasyUnlockKeyManager* UserSessionManager::GetEasyUnlockKeyManager() {
   if (!easy_unlock_key_manager_)
     easy_unlock_key_manager_.reset(new EasyUnlockKeyManager);
 
   return easy_unlock_key_manager_.get();
 }
 
 }  // namespace chromeos