New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/fake_user_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 83 matching lines @@
       const std::string& username) const override;
   virtual void SaveUserDisplayEmail(const std::string& username,
       const std::string& display_email) override {}
   virtual std::string GetUserDisplayEmail(
       const std::string& username) const override;
   virtual bool IsCurrentUserOwner() const override;
   virtual bool IsCurrentUserNew() const override;
   virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const override;
   virtual bool CanCurrentUserLock() const override;
   virtual bool IsUserLoggedIn() const override;
-  virtual bool IsLoggedInAsRegularUser() const override;
+  virtual bool IsLoggedInAsUserWithGaiaAccount() const override;
   virtual bool IsLoggedInAsDemoUser() const override;
   virtual bool IsLoggedInAsPublicAccount() const override;
   virtual bool IsLoggedInAsGuest() const override;
   virtual bool IsLoggedInAsSupervisedUser() const override;
   virtual bool IsLoggedInAsKioskApp() const override;
   virtual bool IsLoggedInAsStub() const override;
   virtual bool IsSessionStarted() const override;
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& email) const override;
   virtual void AddObserver(Observer* obs) override {}
@@ skipping 51 matching lines @@
   // active user.
   std::string active_user_id_;
   MultiProfileUserController* multi_profile_user_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeUserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_