Update {virtual,override,final} to follow C++11 style in chrome/brows…

…er/chromeos/login/users.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463
R=alemate@chromium.org

Review URL: https://codereview.chromium.org/849313002

Cr-Commit-Position: refs/heads/master@{#311964}

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

@@ -103,27 +103,26 @@ class UserImageManagerTest : public LoginManagerTest,
   }
 
   // LoginManagerTest overrides:
-  virtual void SetUpInProcessBrowserTestFixture() override {
+  void SetUpInProcessBrowserTestFixture() override {
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
 
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_));
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
     local_state_ = g_browser_process->local_state();
     user_manager::UserManager::Get()->AddObserver(this);
   }
 
-  virtual void TearDownOnMainThread() override {
+  void TearDownOnMainThread() override {
     user_manager::UserManager::Get()->RemoveObserver(this);
     LoginManagerTest::TearDownOnMainThread();
   }
 
   // UserManager::Observer overrides:
-  virtual void LocalStateChanged(
-      user_manager::UserManager* user_manager) override {
+  void LocalStateChanged(user_manager::UserManager* user_manager) override {
     if (run_loop_)
       run_loop_->Quit();
   }
@@ -605,13 +604,13 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
   }
 
   // UserImageManagerTest overrides:
-  virtual void SetUpInProcessBrowserTestFixture() override {
+  void SetUpInProcessBrowserTestFixture() override {
     DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     UserImageManagerTest::SetUpInProcessBrowserTestFixture();
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     UserImageManagerTest::SetUpOnMainThread();
 
     base::FilePath user_keys_dir;
@@ -640,12 +639,12 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
   }
 
   // policy::CloudPolicyStore::Observer overrides:
-  virtual void OnStoreLoaded(policy::CloudPolicyStore* store) override {
+  void OnStoreLoaded(policy::CloudPolicyStore* store) override {
     if (run_loop_)
       run_loop_->Quit();
   }
 
-  virtual void OnStoreError(policy::CloudPolicyStore* store) override {
+  void OnStoreError(policy::CloudPolicyStore* store) override {
     if (run_loop_)
       run_loop_->Quit();
   }

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h

@@ -46,25 +46,24 @@ class UserImageManagerImpl
   // UserImageManager:
   UserImageManagerImpl(const std::string& user_id,
                        user_manager::UserManager* user_manager);
-  virtual ~UserImageManagerImpl();
-
-  virtual void LoadUserImage() override;
-  virtual void UserLoggedIn(bool user_is_new, bool user_is_local) override;
-  virtual void SaveUserDefaultImageIndex(int default_image_index) override;
-  virtual void SaveUserImage(
-      const user_manager::UserImage& user_image) override;
-  virtual void SaveUserImageFromFile(const base::FilePath& path) override;
-  virtual void SaveUserImageFromProfileImage() override;
-  virtual void DeleteUserImage() override;
-  virtual void DownloadProfileImage(const std::string& reason) override;
-  virtual const gfx::ImageSkia& DownloadedProfileImage() const override;
-  virtual UserImageSyncObserver* GetSyncObserver() const override;
-  virtual void Shutdown() override;
-
-  virtual void OnExternalDataSet(const std::string& policy) override;
-  virtual void OnExternalDataCleared(const std::string& policy) override;
-  virtual void OnExternalDataFetched(const std::string& policy,
-                                     scoped_ptr<std::string> data) override;
+  ~UserImageManagerImpl() override;
+
+  void LoadUserImage() override;
+  void UserLoggedIn(bool user_is_new, bool user_is_local) override;
+  void SaveUserDefaultImageIndex(int default_image_index) override;
+  void SaveUserImage(const user_manager::UserImage& user_image) override;
+  void SaveUserImageFromFile(const base::FilePath& path) override;
+  void SaveUserImageFromProfileImage() override;
+  void DeleteUserImage() override;
+  void DownloadProfileImage(const std::string& reason) override;
+  const gfx::ImageSkia& DownloadedProfileImage() const override;
+  UserImageSyncObserver* GetSyncObserver() const override;
+  void Shutdown() override;
+
+  void OnExternalDataSet(const std::string& policy) override;
+  void OnExternalDataCleared(const std::string& policy) override;
+  void OnExternalDataFetched(const std::string& policy,
+                             scoped_ptr<std::string> data) override;
 
   static void IgnoreProfileDataDownloadDelayForTesting();
 
@@ -85,12 +84,12 @@ class UserImageManagerImpl
   class Job;
 
   // ProfileDownloaderDelegate:
-  virtual bool NeedsProfilePicture() const override;
-  virtual int GetDesiredImageSideLength() const override;
-  virtual Profile* GetBrowserProfile() override;
-  virtual std::string GetCachedPictureURL() const override;
-  virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) override;
-  virtual void OnProfileDownloadFailure(
+  bool NeedsProfilePicture() const override;
+  int GetDesiredImageSideLength() const override;
+  Profile* GetBrowserProfile() override;
+  std::string GetCachedPictureURL() const override;
+  void OnProfileDownloadSuccess(ProfileDownloader* downloader) override;
+  void OnProfileDownloadFailure(
       ProfileDownloader* downloader,
       ProfileDownloaderDelegate::FailureReason reason) override;
 

chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h

@@ -34,14 +34,14 @@ bool AreImagesEqual(const gfx::ImageSkia& first, const gfx::ImageSkia& second);
 class ImageLoader : public ImageDecoder::Delegate {
  public:
   explicit ImageLoader(const base::FilePath& path);
-  virtual ~ImageLoader();
+  ~ImageLoader() override;
 
   scoped_ptr<gfx::ImageSkia> Load();
 
   // ImageDecoder::Delegate:
-  virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) override;
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override;
+  void OnImageDecoded(const ImageDecoder* decoder,
+                      const SkBitmap& decoded_image) override;
+  void OnDecodeImageFailed(const ImageDecoder* decoder) override;
 
  private:
   base::FilePath path_;

chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

@@ -45,7 +45,7 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver,
 
  public:
   explicit UserImageSyncObserver(const user_manager::User* user);
-  virtual ~UserImageSyncObserver();
+  ~UserImageSyncObserver() override;
 
   // Register syncable preference for profile.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -60,12 +60,12 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver,
 
  private:
   // PrefServiceSyncableObserver implementation.
-  virtual void OnIsSyncingChanged() override;
+  void OnIsSyncingChanged() override;
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // Called after user profile was loaded.
   void OnProfileGained(Profile* profile);

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

@@ -25,7 +25,7 @@ class ChromeUserManager : public user_manager::UserManagerBase {
  public:
   ChromeUserManager(scoped_refptr<base::TaskRunner> task_runner,
                     scoped_refptr<base::TaskRunner> blocking_task_runner);
-  virtual ~ChromeUserManager();
+  ~ChromeUserManager() override;
 
   // Returns current ChromeUserManager or NULL if instance hasn't been
   // yet initialized.

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

@@ -55,7 +55,7 @@ class ChromeUserManagerImpl
       public policy::DeviceLocalAccountPolicyService::Observer,
       public MultiProfileUserControllerDelegate {
  public:
-  virtual ~ChromeUserManagerImpl();
+  ~ChromeUserManagerImpl() override;
 
   // Creates ChromeUserManagerImpl instance.
   static scoped_ptr<ChromeUserManager> CreateChromeUserManager();
@@ -64,85 +64,81 @@ class ChromeUserManagerImpl
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // ChromeUserManager implementation:
-  virtual MultiProfileUserController* GetMultiProfileUserController() override;
-  virtual UserImageManager* GetUserImageManager(
-      const std::string& user_id) override;
-  virtual SupervisedUserManager* GetSupervisedUserManager() override;
-  virtual UserFlow* GetCurrentUserFlow() const override;
-  virtual UserFlow* GetUserFlow(const std::string& user_id) const override;
-  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) override;
-  virtual void ResetUserFlow(const std::string& user_id) override;
+  MultiProfileUserController* GetMultiProfileUserController() override;
+  UserImageManager* GetUserImageManager(const std::string& user_id) override;
+  SupervisedUserManager* GetSupervisedUserManager() override;
+  UserFlow* GetCurrentUserFlow() const override;
+  UserFlow* GetUserFlow(const std::string& user_id) const override;
+  void SetUserFlow(const std::string& user_id, UserFlow* flow) override;
+  void ResetUserFlow(const std::string& user_id) override;
 
   // UserManager implementation:
-  virtual void Shutdown() override;
-  virtual user_manager::UserList GetUsersAllowedForMultiProfile()
+  void Shutdown() override;
+  user_manager::UserList GetUsersAllowedForMultiProfile() const override;
+  user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
       const override;
-  virtual user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
-      const override;
-  virtual user_manager::UserList GetUnlockUsers() const override;
-  virtual void SessionStarted() override;
-  virtual void SaveUserOAuthStatus(
+  user_manager::UserList GetUnlockUsers() const override;
+  void SessionStarted() override;
+  void SaveUserOAuthStatus(
       const std::string& user_id,
       user_manager::User::OAuthTokenStatus oauth_token_status) override;
-  virtual void SaveUserDisplayName(const std::string& user_id,
-                                   const base::string16& display_name) override;
-  virtual bool CanCurrentUserLock() const override;
-  virtual bool IsUserNonCryptohomeDataEphemeral(
+  void SaveUserDisplayName(const std::string& user_id,
+                           const base::string16& display_name) override;
+  bool CanCurrentUserLock() const override;
+  bool IsUserNonCryptohomeDataEphemeral(
       const std::string& user_id) const override;
-  virtual bool AreSupervisedUsersAllowed() const override;
+  bool AreSupervisedUsersAllowed() const override;
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // policy::CloudExternalDataPolicyObserver::Delegate:
-  virtual void OnExternalDataSet(const std::string& policy,
-                                 const std::string& user_id) override;
-  virtual void OnExternalDataCleared(const std::string& policy,
-                                     const std::string& user_id) override;
-  virtual void OnExternalDataFetched(const std::string& policy,
-                                     const std::string& user_id,
-                                     scoped_ptr<std::string> data) override;
+  void OnExternalDataSet(const std::string& policy,
+                         const std::string& user_id) override;
+  void OnExternalDataCleared(const std::string& policy,
+                             const std::string& user_id) override;
+  void OnExternalDataFetched(const std::string& policy,
+                             const std::string& user_id,
+                             scoped_ptr<std::string> data) override;
 
   // policy::DeviceLocalAccountPolicyService::Observer implementation.
-  virtual void OnPolicyUpdated(const std::string& user_id) override;
-  virtual void OnDeviceLocalAccountsChanged() override;
+  void OnPolicyUpdated(const std::string& user_id) override;
+  void OnDeviceLocalAccountsChanged() override;
 
   void StopPolicyObserverForTesting();
 
  protected:
   // UserManagerBase implementation:
-  virtual bool AreEphemeralUsersEnabled() const override;
-  virtual const std::string& GetApplicationLocale() const override;
-  virtual PrefService* GetLocalState() const override;
-  virtual void HandleUserOAuthTokenStatusChange(
+  bool AreEphemeralUsersEnabled() const override;
+  const std::string& GetApplicationLocale() const override;
+  PrefService* GetLocalState() const override;
+  void HandleUserOAuthTokenStatusChange(
       const std::string& user_id,
       user_manager::User::OAuthTokenStatus status) const override;
-  virtual bool IsEnterpriseManaged() const override;
-  virtual void LoadPublicAccounts(std::set<std::string>* users_set) override;
-  virtual void NotifyOnLogin() override;
-  virtual void NotifyUserAddedToSession(const user_manager::User* added_user,
-                                        bool user_switch_pending) override;
-  virtual void PerformPreUserListLoadingActions() override;
-  virtual void PerformPostUserListLoadingActions() override;
-  virtual void PerformPostUserLoggedInActions(bool browser_restart) override;
-  virtual void RemoveNonCryptohomeData(const std::string& user_id) override;
-  virtual void RemoveUserInternal(
-      const std::string& user_email,
-      user_manager::RemoveUserDelegate* delegate) override;
-  virtual bool IsDemoApp(const std::string& user_id) const override;
-  virtual bool IsKioskApp(const std::string& user_id) const override;
-  virtual bool IsPublicAccountMarkedForRemoval(
+  bool IsEnterpriseManaged() const override;
+  void LoadPublicAccounts(std::set<std::string>* users_set) override;
+  void NotifyOnLogin() override;
+  void NotifyUserAddedToSession(const user_manager::User* added_user,
+                                bool user_switch_pending) override;
+  void PerformPreUserListLoadingActions() override;
+  void PerformPostUserListLoadingActions() override;
+  void PerformPostUserLoggedInActions(bool browser_restart) override;
+  void RemoveNonCryptohomeData(const std::string& user_id) override;
+  void RemoveUserInternal(const std::string& user_email,
+                          user_manager::RemoveUserDelegate* delegate) override;
+  bool IsDemoApp(const std::string& user_id) const override;
+  bool IsKioskApp(const std::string& user_id) const override;
+  bool IsPublicAccountMarkedForRemoval(
       const std::string& user_id) const override;
-  virtual void DemoAccountLoggedIn() override;
-  virtual void GuestUserLoggedIn() override;
-  virtual void KioskAppLoggedIn(const std::string& app_id) override;
-  virtual void PublicAccountUserLoggedIn(user_manager::User* user) override;
-  virtual void RegularUserLoggedIn(const std::string& user_id) override;
-  virtual void RegularUserLoggedInAsEphemeral(
-      const std::string& user_id) override;
-  virtual void SupervisedUserLoggedIn(const std::string& user_id) override;
+  void DemoAccountLoggedIn() override;
+  void GuestUserLoggedIn() override;
+  void KioskAppLoggedIn(const std::string& app_id) override;
+  void PublicAccountUserLoggedIn(user_manager::User* user) override;
+  void RegularUserLoggedIn(const std::string& user_id) override;
+  void RegularUserLoggedInAsEphemeral(const std::string& user_id) override;
+  void SupervisedUserLoggedIn(const std::string& user_id) override;
 
  private:
   friend class SupervisedUserManagerImpl;
@@ -193,7 +189,7 @@ class ChromeUserManagerImpl
   UserFlow* GetDefaultUserFlow() const;
 
   // MultiProfileUserControllerDelegate implementation:
-  virtual void OnUserNotAllowed(const std::string& user_email) override;
+  void OnUserNotAllowed(const std::string& user_email) override;
 
   // Update the number of users.
   void UpdateNumberOfUsers();