Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6071)

Unified Diff: chrome/installer/util/google_update_settings_unittest.cc

Issue 627423002: Replacing the OVERRIDE with override in chrome/installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch is rebased Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/google_chrome_sxs_distribution.h ('k') | chrome/installer/util/install_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_update_settings_unittest.cc
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index 2069bf2c12240851bb33b940842f37c21728d11a..4504d162ab60c77f7312dfc8acaa06cf2353d0e0 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -34,7 +34,7 @@ const wchar_t kTestExperimentLabel[] = L"test_label_value";
// and user settings.
class GoogleUpdateSettingsTest : public testing::Test {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
registry_overrides_.OverrideRegistry(HKEY_LOCAL_MACHINE);
registry_overrides_.OverrideRegistry(HKEY_CURRENT_USER);
}
@@ -858,7 +858,7 @@ class GetUninstallCommandLine : public GoogleUpdateSettingsTest,
protected:
static const wchar_t kDummyCommand[];
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
GoogleUpdateSettingsTest::SetUp();
system_install_ = GetParam();
root_key_ = system_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -917,7 +917,7 @@ class GetGoogleUpdateVersion : public GoogleUpdateSettingsTest,
protected:
static const wchar_t kDummyVersion[];
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
GoogleUpdateSettingsTest::SetUp();
system_install_ = GetParam();
root_key_ = system_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -1035,7 +1035,7 @@ class CollectStatsConsent : public ::testing::TestWithParam<StatsState> {
static void SetUpTestCase();
static void TearDownTestCase();
protected:
- virtual void SetUp() OVERRIDE;
+ virtual void SetUp() override;
static void MakeChromeMultiInstall(HKEY root_key);
static void ApplySetting(StatsState::StateSetting setting,
HKEY root_key,
« no previous file with comments | « chrome/installer/util/google_chrome_sxs_distribution.h ('k') | chrome/installer/util/install_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698