Methods and types rename for child accounts.

components/user_manager/user_manager_base.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 COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 72 matching lines @@
                             const UserType& user_type) override;
   virtual void UpdateUserAccountData(
       const std::string& user_id,
       const UserAccountData& account_data) 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 IsLoggedInAsUserWithGaiaAccount() const override;
-  virtual bool IsLoggedInAsRegularSupervisedUser() const override;
+  virtual bool IsLoggedInAsChildUser() 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& user_id) const override;
   virtual void AddObserver(UserManager::Observer* obs) override;
   virtual void RemoveObserver(UserManager::Observer* obs) override;
   virtual void AddSessionStateObserver(
       UserManager::UserSessionStateObserver* obs) override;
   virtual void RemoveSessionStateObserver(
       UserManager::UserSessionStateObserver* obs) override;
   virtual void NotifyLocalStateChanged() override;
-  virtual void ChangeUserSupervisedStatus(User* user, bool is_supervised)
-      override;
+  virtual void ChangeUserChildStatus(User* user, bool is_child) override;
 
   // Helper function that copies users from |users_list| to |users_vector| and
   // |users_set|. Duplicates and users already present in |existing_users| are
   // skipped.
   static void ParseUserList(const base::ListValue& users_list,
                             const std::set<std::string>& existing_users,
                             std::vector<std::string>* users_vector,
                             std::set<std::string>* users_set);
 
  protected:
@@ skipping 266 matching lines @@
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_