Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / users / supervised_user_manager_impl.h

diff --git a/src/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h b/src/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
index eaa013f..3b0d107 100644 (file)
--- a/src/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
+++ b/src/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
@@ -16,6 +16,7 @@ namespace chromeos {
 
 class ChromeUserManagerImpl;
 class CrosSettings;
+class SupervisedUserTestBase;
 
 // Implementation of the UserManager.
 class SupervisedUserManagerImpl
@@ -23,45 +24,46 @@ class SupervisedUserManagerImpl
  public:
   virtual ~SupervisedUserManagerImpl();
 
-  virtual bool HasSupervisedUsers(const std::string& manager_id) const OVERRIDE;
+  virtual bool HasSupervisedUsers(const std::string& manager_id) const override;
   virtual const user_manager::User* CreateUserRecord(
       const std::string& manager_id,
       const std::string& local_user_id,
       const std::string& sync_user_id,
-      const base::string16& display_name) OVERRIDE;
-  virtual std::string GenerateUserId() OVERRIDE;
+      const base::string16& display_name) override;
+  virtual std::string GenerateUserId() override;
   virtual const user_manager::User* FindByDisplayName(
-      const base::string16& display_name) const OVERRIDE;
+      const base::string16& display_name) const override;
   virtual const user_manager::User* FindBySyncId(
-      const std::string& sync_id) const OVERRIDE;
-  virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE;
+      const std::string& sync_id) const override;
+  virtual std::string GetUserSyncId(const std::string& user_id) const override;
   virtual base::string16 GetManagerDisplayName(const std::string& user_id) const
-      OVERRIDE;
+      override;
   virtual std::string GetManagerUserId(const std::string& user_id) const
-      OVERRIDE;
+      override;
   virtual std::string GetManagerDisplayEmail(const std::string& user_id) const
-      OVERRIDE;
+      override;
   virtual void StartCreationTransaction(const base::string16& display_name)
-      OVERRIDE;
+      override;
   virtual void SetCreationTransactionUserId(const std::string& user_id)
-      OVERRIDE;
-  virtual void CommitCreationTransaction() OVERRIDE;
-  virtual SupervisedUserAuthentication* GetAuthentication() OVERRIDE;
+      override;
+  virtual void CommitCreationTransaction() override;
+  virtual SupervisedUserAuthentication* GetAuthentication() override;
   virtual void GetPasswordInformation(const std::string& user_id,
-                                      base::DictionaryValue* result) OVERRIDE;
+                                      base::DictionaryValue* result) override;
   virtual void SetPasswordInformation(
       const std::string& user_id,
-      const base::DictionaryValue* password_info) OVERRIDE;
+      const base::DictionaryValue* password_info) override;
   virtual void LoadSupervisedUserToken(
       Profile * profile,
-      const LoadTokenCallback& callback) OVERRIDE;
+      const LoadTokenCallback& callback) override;
   virtual void ConfigureSyncWithToken(
       Profile* profile,
-      const std::string& token) OVERRIDE;
+      const std::string& token) override;
 
  private:
   friend class ChromeUserManagerImpl;
   friend class UserManager;
+  friend class SupervisedUserTestBase;
 
   explicit SupervisedUserManagerImpl(ChromeUserManagerImpl* owner);