Apply automated fixits for Chrome clang plugin to chrome.

Working on trimming down plugin warnings on the Windows clang build.

BUG=467287
NOPRESUBMIT=true

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

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

33 files changed, 79 insertions, 92 deletions

diff --git a/chrome/installer/gcapi/gcapi_last_run_test.cc b/chrome/installer/gcapi/gcapi_last_run_test.cc
index 85e7eed..665d437 100644
--- a/chrome/installer/gcapi/gcapi_last_run_test.cc
+++ b/chrome/installer/gcapi/gcapi_last_run_test.cc
@@ -24,7 +24,7 @@ using base::win::RegKey;
 
 class GCAPILastRunTest : public ::testing::Test {
  protected:
-  void SetUp() {
+  void SetUp() override {
     // Override keys - this is undone during destruction.
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
 
diff --git a/chrome/installer/mini_installer/mini_string_test.cc b/chrome/installer/mini_installer/mini_string_test.cc
index 67b11f9..e83f165 100644
--- a/chrome/installer/mini_installer/mini_string_test.cc
+++ b/chrome/installer/mini_installer/mini_string_test.cc
@@ -15,10 +15,8 @@ using mini_installer::StackString;
 namespace {
 class MiniInstallerStringTest : public testing::Test {
  protected:
-  virtual void SetUp() {
-  }
-  virtual void TearDown() {
-  }
+  void SetUp() override {}
+  void TearDown() override {}
 };
 }
 
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index d47f042..9cd28f0 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -166,7 +166,7 @@ class MockInstallerState : public InstallerState {
 
 class InstallWorkerTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     current_version_.reset(new Version("1.0.0.0"));
     new_version_.reset(new Version("42.0.0.0"));
 
@@ -186,8 +186,7 @@ class InstallWorkerTest : public testing::Test {
     temp_dir_ = base::FilePath(L"C:\\UnlikelyPath\\Temp\\chrome_123");
   }
 
-  virtual void TearDown() {
-  }
+  void TearDown() override {}
 
   void MaybeAddBinariesToInstallationState(
       bool system_level,
diff --git a/chrome/installer/util/conditional_work_item_list.h b/chrome/installer/util/conditional_work_item_list.h
index 97cdd7a..ae5cdc9 100644
--- a/chrome/installer/util/conditional_work_item_list.h
+++ b/chrome/installer/util/conditional_work_item_list.h
@@ -15,15 +15,15 @@
 class ConditionalWorkItemList : public WorkItemList {
  public:
   explicit ConditionalWorkItemList(Condition* condition);
-  virtual ~ConditionalWorkItemList();
+  ~ConditionalWorkItemList() override;
 
   // If condition_->ShouldRun() returns true, then execute the items in this
   // list and return true iff they all succeed. If condition_->ShouldRun()
   // returns false, does nothing and returns true.
-  virtual bool Do();
+  bool Do() override;
 
   // Does a rollback of the items (if any) that were run in Do.
-  virtual void Rollback();
+  void Rollback() override;
 
  protected:
   // Pointer to a Condition that is used to determine whether to run this
@@ -38,7 +38,7 @@ class ConditionRunIfFileExists : public WorkItem::Condition {
  public:
   explicit ConditionRunIfFileExists(const base::FilePath& key_path)
       : key_path_(key_path) {}
-  bool ShouldRun() const;
+  bool ShouldRun() const override;
 
  private:
   base::FilePath key_path_;
@@ -49,9 +49,9 @@ class ConditionRunIfFileExists : public WorkItem::Condition {
 class Not : public WorkItem::Condition {
  public:
   explicit Not(WorkItem::Condition* original_condition);
-  ~Not();
+  ~Not() override;
 
-  bool ShouldRun() const;
+  bool ShouldRun() const override;
 
  private:
   scoped_ptr<WorkItem::Condition> original_condition_;
diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h
index af01cf5..9aa426a 100644
--- a/chrome/installer/util/copy_tree_work_item.h
+++ b/chrome/installer/util/copy_tree_work_item.h
@@ -25,11 +25,11 @@
 // losing ACLs or other metadata in the case of a rollback.
 class CopyTreeWorkItem : public WorkItem {
  public:
-  virtual ~CopyTreeWorkItem();
+  ~CopyTreeWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc
index 035696c..35cc3af 100644
--- a/chrome/installer/util/copy_tree_work_item_unittest.cc
+++ b/chrome/installer/util/copy_tree_work_item_unittest.cc
@@ -21,14 +21,12 @@ namespace {
 
 class CopyTreeWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() {
-    logging::CloseLogFile();
-  }
+  void TearDown() override { logging::CloseLogFile(); }
 
   // the path to temporary directory used to contain the test operations
   base::ScopedTempDir test_dir_;
diff --git a/chrome/installer/util/create_dir_work_item.h b/chrome/installer/util/create_dir_work_item.h
index 83d3d05..217196d 100644
--- a/chrome/installer/util/create_dir_work_item.h
+++ b/chrome/installer/util/create_dir_work_item.h
@@ -14,15 +14,15 @@
 // It also creates all necessary intermediate paths if they do not exist.
 class CreateDirWorkItem : public WorkItem {
  public:
-  virtual ~CreateDirWorkItem();
+  ~CreateDirWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
   // Rollback tries to remove all directories created along the path.
   // If the leaf directory or one of the intermediate directories are not
   // empty, the non-empty directory and its parent directories will not be
   // removed.
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/create_dir_work_item_unittest.cc b/chrome/installer/util/create_dir_work_item_unittest.cc
index 22213d6..07ce874 100644
--- a/chrome/installer/util/create_dir_work_item_unittest.cc
+++ b/chrome/installer/util/create_dir_work_item_unittest.cc
@@ -16,9 +16,7 @@
 namespace {
   class CreateDirWorkItemTest : public testing::Test {
    protected:
-    virtual void SetUp() {
-      ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    }
+    void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
 
     base::ScopedTempDir temp_dir_;
   };
diff --git a/chrome/installer/util/create_reg_key_work_item.h b/chrome/installer/util/create_reg_key_work_item.h
index 455cb4b..a55d941 100644
--- a/chrome/installer/util/create_reg_key_work_item.h
+++ b/chrome/installer/util/create_reg_key_work_item.h
@@ -16,11 +16,11 @@
 // It also creates all necessary intermediate keys if they do not exist.
 class CreateRegKeyWorkItem : public WorkItem {
  public:
-  virtual ~CreateRegKeyWorkItem();
+  ~CreateRegKeyWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/create_reg_key_work_item_unittest.cc b/chrome/installer/util/create_reg_key_work_item_unittest.cc
index 6b4bc15..888a0dc 100644
--- a/chrome/installer/util/create_reg_key_work_item_unittest.cc
+++ b/chrome/installer/util/create_reg_key_work_item_unittest.cc
@@ -20,7 +20,7 @@ wchar_t test_root[] = L"TmpTmp";
 
 class CreateRegKeyWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     // Create a temporary key for testing
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     key.DeleteKey(test_root);
@@ -28,7 +28,7 @@ class CreateRegKeyWorkItemTest : public testing::Test {
     ASSERT_EQ(ERROR_SUCCESS, key.Create(HKEY_CURRENT_USER, test_root,
                                         KEY_READ));
   }
-  virtual void TearDown() {
+  void TearDown() override {
     logging::CloseLogFile();
     // Clean up the temporary key
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
diff --git a/chrome/installer/util/delete_after_reboot_helper_unittest.cc b/chrome/installer/util/delete_after_reboot_helper_unittest.cc
index b6f5046..f0acaca 100644
--- a/chrome/installer/util/delete_after_reboot_helper_unittest.cc
+++ b/chrome/installer/util/delete_after_reboot_helper_unittest.cc
@@ -22,7 +22,7 @@ namespace {
 // your PendingFileRenameOperations value.
 class DeleteAfterRebootHelperTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     // Create a temporary directory for testing and fill it with some files.
     base::CreateNewTempDirectory(base::FilePath::StringType(), &temp_dir_);
     base::CreateTemporaryFileInDir(temp_dir_, &temp_file_);
@@ -36,7 +36,7 @@ class DeleteAfterRebootHelperTest : public testing::Test {
       GetPendingMovesValue(&original_pending_moves_);
     }
   }
-  virtual void TearDown() {
+  void TearDown() override {
     // Delete the temporary directory if it's still there.
     base::DeleteFile(temp_dir_, true);
 
diff --git a/chrome/installer/util/delete_reg_key_work_item_unittest.cc b/chrome/installer/util/delete_reg_key_work_item_unittest.cc
index 5e8c435..e02b7f5 100644
--- a/chrome/installer/util/delete_reg_key_work_item_unittest.cc
+++ b/chrome/installer/util/delete_reg_key_work_item_unittest.cc
@@ -20,7 +20,7 @@ class DeleteRegKeyWorkItemTest : public testing::Test {
     logging::CloseLogFile();
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(test_data_.Initialize(HKEY_CURRENT_USER, L"SOFTWARE\\TmpTmp"));
   }
 
diff --git a/chrome/installer/util/delete_reg_value_work_item.h b/chrome/installer/util/delete_reg_value_work_item.h
index 582d3bd..f1bd50a 100644
--- a/chrome/installer/util/delete_reg_value_work_item.h
+++ b/chrome/installer/util/delete_reg_value_work_item.h
@@ -16,11 +16,11 @@
 // key exists.
 class DeleteRegValueWorkItem : public WorkItem {
  public:
-  virtual ~DeleteRegValueWorkItem();
+  ~DeleteRegValueWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/delete_reg_value_work_item_unittest.cc b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
index 839fd72..bf24bba 100644
--- a/chrome/installer/util/delete_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
@@ -23,7 +23,7 @@ const wchar_t kNameDword[] = L"name_dword";
 
 class DeleteRegValueWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     // Create a temporary key for testing
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     key.DeleteKey(kTestRoot);
@@ -31,7 +31,7 @@ class DeleteRegValueWorkItemTest : public testing::Test {
     ASSERT_EQ(ERROR_SUCCESS,
         key.Create(HKEY_CURRENT_USER, kTestRoot, KEY_READ));
   }
-  virtual void TearDown() {
+  void TearDown() override {
     logging::CloseLogFile();
     // Clean up the temporary key
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h
index e3c2bd5..e233af51 100644
--- a/chrome/installer/util/delete_tree_work_item.h
+++ b/chrome/installer/util/delete_tree_work_item.h
@@ -19,11 +19,11 @@
 // specified, deletion will be performed only if all key files are not in use.
 class DeleteTreeWorkItem : public WorkItem {
  public:
-  virtual ~DeleteTreeWorkItem();
+  ~DeleteTreeWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc
index 75493fd..48f321f 100644
--- a/chrome/installer/util/delete_tree_work_item_unittest.cc
+++ b/chrome/installer/util/delete_tree_work_item_unittest.cc
@@ -20,9 +20,7 @@ namespace {
 
 class DeleteTreeWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-  }
+  void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
 
   // The temporary directory used to contain the test operations.
   base::ScopedTempDir temp_dir_;
diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc
index 65bb06e..c9b50e8 100644
--- a/chrome/installer/util/duplicate_tree_detector_unittest.cc
+++ b/chrome/installer/util/duplicate_tree_detector_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 
 class DuplicateTreeDetectorTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_source_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_dest_dir_.CreateUniqueTempDir());
   }
diff --git a/chrome/installer/util/google_chrome_binaries_distribution.h b/chrome/installer/util/google_chrome_binaries_distribution.h
index 805ba50..46fd43f 100644
--- a/chrome/installer/util/google_chrome_binaries_distribution.h
+++ b/chrome/installer/util/google_chrome_binaries_distribution.h
@@ -11,13 +11,13 @@
 
 class GoogleChromeBinariesDistribution : public ChromiumBinariesDistribution {
  public:
-  virtual base::string16 GetDisplayName();
+  base::string16 GetDisplayName() override;
 
-  virtual base::string16 GetShortcutName(ShortcutType shortcut_type);
+  base::string16 GetShortcutName(ShortcutType shortcut_type) override;
 
-  virtual void UpdateInstallStatus(bool system_install,
-      installer::ArchiveType archive_type,
-      installer::InstallStatus install_status);
+  void UpdateInstallStatus(bool system_install,
+                           installer::ArchiveType archive_type,
+                           installer::InstallStatus install_status) override;
 
  protected:
   friend class BrowserDistribution;
diff --git a/chrome/installer/util/html_dialog.h b/chrome/installer/util/html_dialog.h
index c6d6a58..d885c23 100644
--- a/chrome/installer/util/html_dialog.h
+++ b/chrome/installer/util/html_dialog.h
@@ -88,8 +88,8 @@ class EulaHTMLDialog {
  private:
   class Customizer : public HTMLDialog::CustomizationCallback {
    public:
-    virtual void OnBeforeCreation(wchar_t** extra);
-    virtual void OnBeforeDisplay(void* window);
+    void OnBeforeCreation(wchar_t** extra) override;
+    void OnBeforeDisplay(void* window) override;
   };
 
   HTMLDialog* dialog_;
diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc
index 2df4447..679aa74 100644
--- a/chrome/installer/util/html_dialog_impl.cc
+++ b/chrome/installer/util/html_dialog_impl.cc
@@ -46,17 +46,15 @@ class HTMLDialogWin : public HTMLDialog {
        mshtml_ = LoadLibrary(L"MSHTML.DLL");
   }
 
-  virtual DialogResult ShowModal(void* parent_window,
-                                 CustomizationCallback* callback) {
+  DialogResult ShowModal(void* parent_window,
+                         CustomizationCallback* callback) override {
     int result = HTML_DLG_DECLINE;
     if (!InternalDoDialog(callback, &result))
       return HTML_DLG_ERROR;
     return static_cast<DialogResult>(result);
   }
 
-  virtual std::wstring GetExtraResult() {
-    return extra_result_;
-  }
+  std::wstring GetExtraResult() override { return extra_result_; }
 
  private:
   bool InternalDoDialog(CustomizationCallback* callback, int* result);
diff --git a/chrome/installer/util/installation_validator_unittest.cc b/chrome/installer/util/installation_validator_unittest.cc
index ae015ff..65b9756 100644
--- a/chrome/installer/util/installation_validator_unittest.cc
+++ b/chrome/installer/util/installation_validator_unittest.cc
@@ -277,7 +277,7 @@ class InstallationValidatorTest
       Channel channel,
       Vehicle vehicle,
       FakeInstallationState* state);
-  virtual void TearDown();
+  void TearDown() override;
 
   static logging::LogMessageHandlerFunction old_log_message_handler_;
   static ValidationErrorRecipient* validation_error_recipient_;
diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc
index ac4c4c6..05a8cb1 100644
--- a/chrome/installer/util/lzma_util_unittest.cc
+++ b/chrome/installer/util/lzma_util_unittest.cc
@@ -15,7 +15,7 @@ namespace {
 
 class LzmaUtilTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
     data_dir_ = data_dir_.AppendASCII("installer");
     ASSERT_TRUE(base::PathExists(data_dir_));
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index 02bb393..31f839b 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -19,11 +19,11 @@
 namespace {
 class MasterPreferencesTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(base::CreateTemporaryFile(&prefs_file_));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     EXPECT_TRUE(base::DeleteFile(prefs_file_, false));
   }
 
diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h
index 371182d..eea5cda 100644
--- a/chrome/installer/util/move_tree_work_item.h
+++ b/chrome/installer/util/move_tree_work_item.h
@@ -20,11 +20,11 @@
 // hierarchy is moved back.
 class MoveTreeWorkItem : public WorkItem {
  public:
-  virtual ~MoveTreeWorkItem();
+  ~MoveTreeWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc
index 3198ffe..09da22eb 100644
--- a/chrome/installer/util/move_tree_work_item_unittest.cc
+++ b/chrome/installer/util/move_tree_work_item_unittest.cc
@@ -20,7 +20,7 @@
 namespace {
 class MoveTreeWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_from_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_to_dir_.CreateUniqueTempDir());
   }
diff --git a/chrome/installer/util/product_state_unittest.cc b/chrome/installer/util/product_state_unittest.cc
index 64848e51..5a2de671 100644
--- a/chrome/installer/util/product_state_unittest.cc
+++ b/chrome/installer/util/product_state_unittest.cc
@@ -24,8 +24,8 @@ class ProductStateTest : public testing::Test {
   static void SetUpTestCase();
   static void TearDownTestCase();
 
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 
   void ApplyUninstallCommand(const wchar_t* exe_path, const wchar_t* args);
   void MinimallyInstallProduct(const wchar_t* version);
diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h
index 4d1ccaa..ad8a64a 100644
--- a/chrome/installer/util/product_unittest.h
+++ b/chrome/installer/util/product_unittest.h
@@ -13,16 +13,16 @@
 
 class TestWithTempDir : public testing::Test {
  protected:
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 
   base::ScopedTempDir test_dir_;
 };
 
 class TestWithTempDirAndDeleteTempOverrideKeys : public TestWithTempDir {
  protected:
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_PRODUCT_UNITTEST_H_
diff --git a/chrome/installer/util/registry_key_backup_unittest.cc b/chrome/installer/util/registry_key_backup_unittest.cc
index 32bedb4..2c2c7f9 100644
--- a/chrome/installer/util/registry_key_backup_unittest.cc
+++ b/chrome/installer/util/registry_key_backup_unittest.cc
@@ -20,7 +20,7 @@ class RegistryKeyBackupTest : public testing::Test {
     logging::CloseLogFile();
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(test_data_.Initialize(HKEY_CURRENT_USER, L"SOFTWARE\\TmpTmp"));
     destination_path_.assign(test_data_.base_path()).append(L"\\Destination");
   }
diff --git a/chrome/installer/util/self_reg_work_item.h b/chrome/installer/util/self_reg_work_item.h
index 8b816c8..544621c 100644
--- a/chrome/installer/util/self_reg_work_item.h
+++ b/chrome/installer/util/self_reg_work_item.h
@@ -13,10 +13,10 @@
 // Registers or unregisters the DLL at the given path.
 class SelfRegWorkItem : public WorkItem {
  public:
-  virtual ~SelfRegWorkItem();
+  ~SelfRegWorkItem() override;
 
-  virtual bool Do();
-  virtual void Rollback();
+  bool Do() override;
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/set_reg_value_work_item.h b/chrome/installer/util/set_reg_value_work_item.h
index 16e6279..0c4d0c8 100644
--- a/chrome/installer/util/set_reg_value_work_item.h
+++ b/chrome/installer/util/set_reg_value_work_item.h
@@ -17,11 +17,11 @@
 // exists.
 class SetRegValueWorkItem : public WorkItem {
  public:
-  virtual ~SetRegValueWorkItem();
+  ~SetRegValueWorkItem() override;
 
-  virtual bool Do();
+  bool Do() override;
 
-  virtual void Rollback();
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/set_reg_value_work_item_unittest.cc b/chrome/installer/util/set_reg_value_work_item_unittest.cc
index 9f76111..163f888 100644
--- a/chrome/installer/util/set_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/set_reg_value_work_item_unittest.cc
@@ -27,7 +27,7 @@ const DWORD dword2 = 1;
 
 class SetRegValueWorkItemTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     // Create a temporary key for testing
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     key.DeleteKey(kTestRoot);
@@ -35,7 +35,7 @@ class SetRegValueWorkItemTest : public testing::Test {
     ASSERT_EQ(ERROR_SUCCESS,
         key.Create(HKEY_CURRENT_USER, kTestRoot, KEY_READ));
   }
-  virtual void TearDown() {
+  void TearDown() override {
     logging::CloseLogFile();
     // Clean up the temporary key
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
diff --git a/chrome/installer/util/work_item_list.h b/chrome/installer/util/work_item_list.h
index f00295a..74c0562 100644
--- a/chrome/installer/util/work_item_list.h
+++ b/chrome/installer/util/work_item_list.h
@@ -25,14 +25,14 @@ class FilePath;
 // The WorkItems are executed in the same order as they are added to the list.
 class WorkItemList : public WorkItem {
  public:
-  virtual ~WorkItemList();
+  ~WorkItemList() override;
 
   // Execute the WorkItems in the same order as they are added to the list.
   // It aborts as soon as one WorkItem fails.
-  virtual bool Do();
+  bool Do() override;
 
   // Rollback the WorkItems in the reverse order as they are executed.
-  virtual void Rollback();
+  void Rollback() override;
 
   // Add a WorkItem to the list.
   // A WorkItem can only be added to the list before the list's DO() is called.
@@ -160,15 +160,15 @@ class WorkItemList : public WorkItem {
 // Also, as the class name suggests, Rollback is not possible.
 class NoRollbackWorkItemList : public WorkItemList {
  public:
-  virtual ~NoRollbackWorkItemList();
+  ~NoRollbackWorkItemList() override;
 
   // Execute the WorkItems in the same order as they are added to the list.
   // If a WorkItem fails, the function will return failure but all other
   // WorkItems will still be executed.
-  virtual bool Do();
+  bool Do() override;
 
   // No-op.
-  virtual void Rollback();
+  void Rollback() override;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_WORK_ITEM_LIST_H_
diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc
index 230d028..1a2eb3d 100644
--- a/chrome/installer/util/work_item_list_unittest.cc
+++ b/chrome/installer/util/work_item_list_unittest.cc
@@ -26,14 +26,12 @@ const wchar_t kName[] = L"name";
 
 class WorkItemListTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
   }
 
-  virtual void TearDown() {
-    logging::CloseLogFile();
-  }
+  void TearDown() override { logging::CloseLogFile(); }
 
   base::ScopedTempDir temp_dir_;
   registry_util::RegistryOverrideManager registry_override_manager_;