| Index: chrome/installer/setup/setup_util_unittest.cc
|
| diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
|
| index 6f5752c06ed0502f5bebddeecc6c66a5a5f6f45a..9b92429ca64b9125a5baf4b9acde2ecbe5ca5534 100644
|
| --- a/chrome/installer/setup/setup_util_unittest.cc
|
| +++ b/chrome/installer/setup/setup_util_unittest.cc
|
| @@ -33,12 +33,12 @@ namespace {
|
|
|
| class SetupUtilTestWithDir : public testing::Test {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| // Create a temp directory for testing.
|
| ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| // Clean up test directory manually so we can fail if it leaks.
|
| ASSERT_TRUE(test_dir_.Delete());
|
| }
|
| @@ -289,7 +289,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
|
| }
|
| };
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| SetupUtilTestWithDir::SetUp();
|
| product_version_ = Version("30.0.1559.0");
|
| max_version_ = Version("47.0.1559.0");
|
| @@ -315,7 +315,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
|
| ASSERT_EQ(1, base::WriteFile(GetMaxVersionArchivePath(), "b", 1));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| original_state_.reset();
|
| SetupUtilTestWithDir::TearDown();
|
| }
|
| @@ -409,7 +409,7 @@ namespace {
|
|
|
| class MigrateMultiToSingleTest : public testing::Test {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| registry_override_manager_.OverrideRegistry(kRootKey);
|
| }
|
|
|
|
|