Update {virtual,override} to follow C++11 style in chrome.

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 manually generated using a regex and a text editor.

BUG=417463

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

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

4 files changed, 12 insertions, 12 deletions

diff --git a/chrome/installer/setup/archive_patch_helper_unittest.cc b/chrome/installer/setup/archive_patch_helper_unittest.cc
index 099dd17..f42ed5b 100644
--- a/chrome/installer/setup/archive_patch_helper_unittest.cc
+++ b/chrome/installer/setup/archive_patch_helper_unittest.cc
@@ -24,12 +24,12 @@ class ArchivePatchHelperTest : public testing::Test {
     data_dir_.clear();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc
index 5c3f32c..d011f7e 100644
--- a/chrome/installer/setup/install_unittest.cc
+++ b/chrome/installer/setup/install_unittest.cc
@@ -33,7 +33,7 @@ namespace {
 
 class CreateVisualElementsManifestTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 
@@ -46,7 +46,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
         test_dir_.path().Append(installer::kVisualElementsManifest);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
@@ -66,7 +66,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
 
 class InstallShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     EXPECT_EQ(S_OK, CoInitialize(NULL));
 
     dist_ = BrowserDistribution::GetDistribution();
@@ -139,7 +139,7 @@ class InstallShortcutTest : public testing::Test {
         fake_user_desktop_.path().Append(alternate_shortcut_name);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Try to unpin potentially pinned shortcuts (although pinning isn't tested,
     // the call itself might still have pinned the Start Menu shortcuts).
     base::win::TaskbarUnpinShortcutLink(
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index c288549..d47f042 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -491,7 +491,7 @@ const wchar_t old_elevation_key[] =
 class OldIELowRightsTests : public InstallWorkerTest,
   public ::testing::WithParamInterface<std::tr1::tuple<bool, bool> > {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     InstallWorkerTest::SetUp();
 
     const ParamType& param = GetParam();
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
index c07ec98..dd92f56 100644
--- a/chrome/installer/setup/setup_util_unittest.cc
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -35,12 +35,12 @@ namespace {
 
 class SetupUtilTestWithDir : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
@@ -290,7 +290,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
     }
   };
 
-  virtual void SetUp() override {
+  void SetUp() override {
     SetupUtilTestWithDir::SetUp();
     product_version_ = Version("30.0.1559.0");
     max_version_ = Version("47.0.1559.0");
@@ -316,7 +316,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
     ASSERT_EQ(1, base::WriteFile(GetMaxVersionArchivePath(), "b", 1));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     original_state_.reset();
     SetupUtilTestWithDir::TearDown();
   }
@@ -411,7 +411,7 @@ namespace {
 
 class MigrateMultiToSingleTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     registry_override_manager_.OverrideRegistry(kRootKey);
   }