New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/fake_user_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/users/fake_user_manager.h"
 
 #include "base/task_runner.h"
 #include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/grit/theme_resources.h"
@@ skipping 247 matching lines @@
 }
 
 bool FakeUserManager::CanCurrentUserLock() const {
   return false;
 }
 
 bool FakeUserManager::IsUserLoggedIn() const {
   return logged_in_users_.size() > 0;
 }
 
-bool FakeUserManager::IsLoggedInAsRegularUser() const {
+bool FakeUserManager::IsLoggedInAsUserWithGaiaAccount() const {
   return true;
 }
 
 bool FakeUserManager::IsLoggedInAsDemoUser() const {
   return false;
 }
 
 bool FakeUserManager::IsLoggedInAsPublicAccount() const {
   return false;
 }
@@ skipping 62 matching lines @@
 bool FakeUserManager::IsKioskApp(const std::string& user_id) const {
   return false;
 }
 
 bool FakeUserManager::IsPublicAccountMarkedForRemoval(
     const std::string& user_id) const {
   return false;
 }
 
 }  // namespace chromeos