Standardize usage of virtual/override/final specifiers.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=tzik@chromium.org

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

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

19 files changed, 48 insertions, 50 deletions

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index 8f1f98e..f931200 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -52,9 +52,9 @@ class ConflictResolverTest : public testing::Test {
 
   ConflictResolverTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual ~ConflictResolverTest() {}
+  ~ConflictResolverTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -84,7 +84,7 @@ class ConflictResolverTest : public testing::Test {
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_task_manager_.reset();
     RevokeSyncableFileSystem();
     fake_drive_helper_.reset();
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index 2b6be22..4677395 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -75,9 +75,9 @@ class DriveBackendSyncTest : public testing::Test,
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         pending_remote_changes_(0),
         pending_local_changes_(0) {}
-  virtual ~DriveBackendSyncTest() {}
+  ~DriveBackendSyncTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -136,7 +136,7 @@ class DriveBackendSyncTest : public testing::Test,
     remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     typedef std::map<std::string, CannedSyncableFileSystem*>::iterator iterator;
     for (iterator itr = file_systems_.begin();
          itr != file_systems_.end(); ++itr) {
diff --git a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
index 4d6bd16..383668d 100644
--- a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
@@ -24,15 +24,15 @@ struct TestData {
 
 class LevelDBWrapperTest : public testing::Test {
  public:
-  virtual ~LevelDBWrapperTest() {}
+  ~LevelDBWrapperTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     InitializeLevelDB();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     db_.reset();
     in_memory_env_.reset();
   }
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
index a9f57d2..479b92c 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
@@ -37,9 +37,9 @@ const char kUnregisteredAppID[] = "app_id unregistered";
 class ListChangesTaskTest : public testing::Test {
  public:
   ListChangesTaskTest() {}
-  virtual ~ListChangesTaskTest() {}
+  ~ListChangesTaskTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -74,7 +74,7 @@ class ListChangesTaskTest : public testing::Test {
     RegisterApp(kAppID);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_task_manager_.reset();
     context_.reset();
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
index d35ee5c..957c00b 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -53,9 +53,9 @@ class LocalToRemoteSyncerTest : public testing::Test {
  public:
   LocalToRemoteSyncerTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual ~LocalToRemoteSyncerTest() {}
+  ~LocalToRemoteSyncerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -85,7 +85,7 @@ class LocalToRemoteSyncerTest : public testing::Test {
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_task_manager_.reset();
     RevokeSyncableFileSystem();
     fake_drive_helper_.reset();
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
index 7f2ad73..e90b52f 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
@@ -33,16 +33,16 @@ const int64 kPlaceholderTrackerID = 4;
 
 class MetadataDatabaseIndexOnDiskTest : public testing::Test {
  public:
-  virtual ~MetadataDatabaseIndexOnDiskTest() {}
+  ~MetadataDatabaseIndexOnDiskTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     db_ = InitializeLevelDB();
     index_ = MetadataDatabaseIndexOnDisk::Create(db_.get());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     index_.reset();
     db_.reset();
     in_memory_env_.reset();
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
index 79a04a4..482c0dd 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
@@ -67,7 +67,7 @@ scoped_ptr<DatabaseContents> CreateTestDatabaseContents() {
 
 class MetadataDatabaseIndexTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     InitializeLevelDB();
 
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
index 7bdeb3c..4ef2d57 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -179,12 +179,12 @@ class MetadataDatabaseTest : public testing::TestWithParam<bool> {
 
   virtual ~MetadataDatabaseTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
   }
 
-  virtual void TearDown() override { DropDatabase(); }
+  void TearDown() override { DropDatabase(); }
 
  protected:
   std::string GenerateFileID() {
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
index 4f07e68..ba75c1a 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
@@ -41,9 +41,9 @@ class RegisterAppTaskTest : public testing::Test {
   RegisterAppTaskTest()
       : next_file_id_(1000),
         next_tracker_id_(10000) {}
-  virtual ~RegisterAppTaskTest() {}
+  ~RegisterAppTaskTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -69,7 +69,7 @@ class RegisterAppTaskTest : public testing::Test {
                   kSyncRootFolderTitle, &sync_root_folder_id_));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     context_.reset();
     base::RunLoop().RunUntilIdle();
   }
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
index 343d123..10c9685 100644
--- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
@@ -50,9 +50,9 @@ class RemoteToLocalSyncerTest : public testing::Test {
 
   RemoteToLocalSyncerTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual ~RemoteToLocalSyncerTest() {}
+  ~RemoteToLocalSyncerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -85,7 +85,7 @@ class RemoteToLocalSyncerTest : public testing::Test {
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_task_manager_.reset();
     RevokeSyncableFileSystem();
     fake_drive_helper_.reset();
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
index 4ad4ff8..fbdc33c 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -43,9 +43,9 @@ class SyncEngineInitializerTest : public testing::Test {
   };
 
   SyncEngineInitializerTest() {}
-  virtual ~SyncEngineInitializerTest() {}
+  ~SyncEngineInitializerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -66,7 +66,7 @@ class SyncEngineInitializerTest : public testing::Test {
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_task_manager_.reset();
     metadata_database_.reset();
     sync_context_.reset();
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index b8e04fe..0519881 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -29,9 +29,9 @@ class SyncEngineTest : public testing::Test,
   typedef RemoteFileSyncService::OriginStatusMap RemoteOriginStatusMap;
 
   SyncEngineTest() {}
-  virtual ~SyncEngineTest() {}
+  ~SyncEngineTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
 
     scoped_ptr<drive::DriveServiceInterface>
@@ -69,7 +69,7 @@ class SyncEngineTest : public testing::Test,
     WaitForWorkerTaskRunner();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_engine_.reset();
     WaitForWorkerTaskRunner();
     worker_pool_->Shutdown();
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
index ae2797a..ee98464 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
@@ -101,9 +101,9 @@ class SyncWorkerTest : public testing::Test,
                        public base::SupportsWeakPtr<SyncWorkerTest> {
  public:
   SyncWorkerTest() {}
-  virtual ~SyncWorkerTest() {}
+  ~SyncWorkerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -129,7 +129,7 @@ class SyncWorkerTest : public testing::Test,
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_worker_.reset();
     extension_service_.reset();
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
index 89f2ddb..8c91a3a 100644
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
@@ -42,7 +42,7 @@ class LocalFileChangeTrackerTest : public testing::Test {
                      base::ThreadTaskRunnerHandle::Get().get(),
                      base::ThreadTaskRunnerHandle::Get().get()) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
 
     ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
@@ -56,7 +56,7 @@ class LocalFileChangeTrackerTest : public testing::Test {
         file_system_.MaybeInitializeFileSystemContext(sync_context_.get()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (sync_context_.get())
       sync_context_->ShutdownOnUIThread();
     sync_context_ = nullptr;
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
index 5778fca..e74826f 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
@@ -60,7 +60,7 @@ class LocalFileSyncContextTest : public testing::Test {
         async_modify_finished_(false),
         has_inflight_prepare_for_sync_(false) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     RegisterSyncableFileSystem();
     ASSERT_TRUE(dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
@@ -72,9 +72,7 @@ class LocalFileSyncContextTest : public testing::Test {
         BrowserThread::IO);
   }
 
-  virtual void TearDown() override {
-    RevokeSyncableFileSystem();
-  }
+  void TearDown() override { RevokeSyncableFileSystem(); }
 
   void StartPrepareForSync(FileSystemContext* file_system_context,
                            const FileSystemURL& url,
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
index 0d78aa5..67c7088 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
@@ -109,7 +109,7 @@ class LocalFileSyncServiceTest
                        content::TestBrowserThreadBundle::REAL_IO_THREAD),
         num_changes_(0) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -139,7 +139,7 @@ class LocalFileSyncServiceTest
         set_mock_notify_changes_duration_in_sec(0);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     local_service_->Shutdown();
     file_system_->TearDown();
     RevokeSyncableFileSystem();
@@ -591,7 +591,7 @@ TEST_F(LocalFileSyncServiceTest, RecordFakeChange) {
 class OriginChangeMapTest : public testing::Test {
  protected:
   OriginChangeMapTest() {}
-  virtual ~OriginChangeMapTest() {}
+  ~OriginChangeMapTest() override {}
 
   bool NextOriginToProcess(GURL* origin) {
     return map_.NextOriginToProcess(origin);
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
index 02221ca..69d1fb2 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
@@ -63,7 +63,7 @@ class SyncableFileOperationRunnerTest : public testing::Test {
         url_request_context_(file_system_.file_system_context()),
         weak_factory_(this) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(dir_.CreateUniqueTempDir());
 
     file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
@@ -81,7 +81,7 @@ class SyncableFileOperationRunnerTest : public testing::Test {
               file_system_.CreateDirectory(URL(kParent)));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (sync_context_.get())
       sync_context_->ShutdownOnUIThread();
     sync_context_ = nullptr;
diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
index f9a4ad98..4e1d784 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
@@ -42,7 +42,7 @@ class SyncableFileSystemTest : public testing::Test {
                      base::ThreadTaskRunnerHandle::Get().get()),
         weak_factory_(this) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
 
@@ -56,7 +56,7 @@ class SyncableFileSystemTest : public testing::Test {
         file_system_.MaybeInitializeFileSystemContext(sync_context_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     if (sync_context_.get())
       sync_context_->ShutdownOnUIThread();
     sync_context_ = nullptr;
diff --git a/chrome/browser/sync_file_system/logger_unittest.cc b/chrome/browser/sync_file_system/logger_unittest.cc
index 0d78f58..aad548a 100644
--- a/chrome/browser/sync_file_system/logger_unittest.cc
+++ b/chrome/browser/sync_file_system/logger_unittest.cc
@@ -28,7 +28,7 @@ class LoggerTest : public testing::Test {
  public:
   LoggerTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     logging::SetMinLogLevel(logging::LOG_INFO);
     util::ClearLog();
   }