replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

chrome/browser/prefs/tracked/pref_hash_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 129 matching lines @@
     PROTECTION_ENABLED_EXTENSIONS,
     // Represents the strongest level (i.e. always equivalent to the last one in
     // terms of protection), leave this one last when adding new levels.
     PROTECTION_ENABLED_ALL
   };
 
   PrefHashBrowserTestBase()
       : protection_level_(GetProtectionLevelFromTrialGroup(GetParam())) {
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     EXPECT_FALSE(command_line->HasSwitch(switches::kForceFieldTrials));
     command_line->AppendSwitchASCII(
         switches::kForceFieldTrials,
         std::string(chrome_prefs::internals::kSettingsEnforcementTrialName) +
             "/" + GetParam() + "/");
 #if defined(OS_CHROMEOS)
     command_line->AppendSwitch(
         chromeos::switches::kIgnoreUserProfileMappingForTests);
 #endif
   }
 
-  virtual bool SetUpUserDataDirectory() OVERRIDE {
+  virtual bool SetUpUserDataDirectory() override {
     // Do the normal setup in the PRE test and attack preferences in the main
     // test.
     if (IsPRETest())
       return ExtensionBrowserTest::SetUpUserDataDirectory();
 
 #if defined(OS_CHROMEOS)
     // For some reason, the Preferences file does not exist in the location
     // below on Chrome OS. Since protection is disabled on Chrome OS, it's okay
     // to simply not attack preferences at all (and still assert that no
     // hardening related histogram kicked in in VerifyReactionToPrefAttack()).
@@ skipping 50 matching lines @@
       JSONFileValueSerializer protected_prefs_serializer(protected_pref_file);
       EXPECT_TRUE(protected_prefs_serializer.Serialize(*protected_preferences));
     }
 
     return true;
   }
 
   // In the PRE_ test, find the number of tracked preferences that were
   // initialized and save it to a file to be read back in the main test and used
   // as the total number of tracked preferences.
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ExtensionBrowserTest::SetUpOnMainThread();
 
     // File in which the PRE_ test will save the number of tracked preferences
     // on this platform.
     const char kNumTrackedPrefFilename[] = "NumTrackedPrefs";
 
     base::FilePath num_tracked_prefs_file;
     ASSERT_TRUE(
         PathService::Get(chrome::DIR_USER_DATA, &num_tracked_prefs_file));
     num_tracked_prefs_file =
@@ skipping 102 matching lines @@
 
   int num_tracked_prefs_;
 };
 
 }  // namespace
 
 // Verifies that nothing is reset when nothing is tampered with.
 // Also sanity checks that the expected preferences files are in place.
 class PrefHashBrowserTestUnchangedDefault : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     // Default Chrome setup.
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     // No attack.
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Expect all prefs to be reported as Unchanged with no resets.
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM
                   ? num_tracked_prefs() : 0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceUnchanged", ALLOW_ANY));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceWantedReset", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceReset",
@@ skipping 23 matching lines @@
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedDefault, UnchangedDefault);
 
 // Augments PrefHashBrowserTestUnchangedDefault to confirm that nothing is reset
 // when nothing is tampered with, even if Chrome itself wrote custom prefs in
 // its last run.
 class PrefHashBrowserTestUnchangedCustom
     : public PrefHashBrowserTestUnchangedDefault {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com");
 
     InstallExtensionWithUIAutoConfirm(
         test_data_dir_.AppendASCII("good.crx"), 1, browser());
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Make sure the settings written in the last run stuck.
     EXPECT_EQ("http://example.com",
               profile()->GetPrefs()->GetString(prefs::kHomePage));
 
     EXPECT_TRUE(extension_service()->GetExtensionById(kGoodCrxId, false));
 
     // Reaction should be identical to unattacked default prefs.
     PrefHashBrowserTestUnchangedDefault::VerifyReactionToPrefAttack();
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedCustom, UnchangedCustom);
 
 // Verifies that cleared prefs are reported.
 class PrefHashBrowserTestClearedAtomic : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com");
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     base::DictionaryValue* selected_prefs =
         protection_level_ >= PROTECTION_ENABLED_BASIC ? protected_preferences
                                                       : unprotected_preferences;
     // |selected_prefs| should never be NULL under the protection level picking
     // it.
     EXPECT_TRUE(selected_prefs);
     EXPECT_TRUE(selected_prefs->Remove(prefs::kHomePage, NULL));
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // The clearance of homepage should have been noticed (as pref #2 being
     // cleared), but shouldn't have triggered a reset (as there is nothing we
     // can do when the pref is already gone).
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceCleared",
                                            BEGIN_ALLOW_SINGLE_BUCKET + 2));
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM
                   ? num_tracked_prefs() - 1 : 0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceUnchanged", ALLOW_ANY));
@@ skipping 23 matching lines @@
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestClearedAtomic, ClearedAtomic);
 
 // Verifies that clearing the MACs results in untrusted Initialized pings for
 // non-null protected prefs.
 class PrefHashBrowserTestUntrustedInitialized : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     // Explicitly set the DSE (it's otherwise NULL by default, preventing
     // thorough testing of the PROTECTION_ENABLED_DSE level).
     DefaultSearchManager default_search_manager(
         profile()->GetPrefs(), DefaultSearchManager::ObserverCallback());
     DefaultSearchManager::Source dse_source =
         static_cast<DefaultSearchManager::Source>(-1);
 
     const TemplateURLData* default_template_url_data =
         default_search_manager.GetDefaultSearchEngine(&dse_source);
     EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, dse_source);
 
     default_search_manager.SetUserSelectedDefaultSearchEngine(
         *default_template_url_data);
 
     default_search_manager.GetDefaultSearchEngine(&dse_source);
     EXPECT_EQ(DefaultSearchManager::FROM_USER, dse_source);
 
     // Also explicitly set an atomic pref that falls under
     // PROTECTION_ENABLED_BASIC.
     profile()->GetPrefs()->SetInteger(prefs::kRestoreOnStartup,
                                       SessionStartupPref::URLS);
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     EXPECT_TRUE(unprotected_preferences->Remove("protection.macs", NULL));
     if (protected_preferences)
       EXPECT_TRUE(protected_preferences->Remove("protection.macs", NULL));
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Preferences that are NULL by default will be NullInitialized.
     int num_null_values = GetTrackedPrefHistogramCount(
         "Settings.TrackedPreferenceNullInitialized", ALLOW_ANY);
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM,
               num_null_values > 0);
     if (num_null_values > 0) {
       // This test requires that at least 3 prefs be non-null (extensions, DSE,
       // and 1 atomic pref explictly set for this test above).
       EXPECT_GE(num_tracked_prefs() - num_null_values, 3);
     }
@@ skipping 68 matching lines @@
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedInitialized,
                        UntrustedInitialized);
 
 // Verifies that changing an atomic pref results in it being reported (and reset
 // if the protection level allows it).
 class PrefHashBrowserTestChangedAtomic : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     profile()->GetPrefs()->SetInteger(prefs::kRestoreOnStartup,
                                       SessionStartupPref::URLS);
 
     ListPrefUpdate update(profile()->GetPrefs(),
                           prefs::kURLsToRestoreOnStartup);
     update->AppendString("http://example.com");
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     base::DictionaryValue* selected_prefs =
         protection_level_ >= PROTECTION_ENABLED_BASIC ? protected_preferences
                                                       : unprotected_preferences;
     // |selected_prefs| should never be NULL under the protection level picking
     // it.
     EXPECT_TRUE(selected_prefs);
     base::ListValue* startup_urls;
     EXPECT_TRUE(
         selected_prefs->GetList(prefs::kURLsToRestoreOnStartup, &startup_urls));
     EXPECT_TRUE(startup_urls);
     EXPECT_EQ(1U, startup_urls->GetSize());
     startup_urls->AppendString("http://example.org");
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Expect a single Changed event for tracked pref #4 (startup URLs).
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceChanged",
                                            BEGIN_ALLOW_SINGLE_BUCKET + 4));
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM
                   ? num_tracked_prefs() - 1 : 0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceUnchanged", ALLOW_ANY));
 
     EXPECT_EQ(
@@ skipping 35 matching lines @@
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedAtomic, ChangedAtomic);
 
 // Verifies that changing or adding an entry in a split pref results in both
 // items being reported (and remove if the protection level allows it).
 class PrefHashBrowserTestChangedSplitPref : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     InstallExtensionWithUIAutoConfirm(
         test_data_dir_.AppendASCII("good.crx"), 1, browser());
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     base::DictionaryValue* selected_prefs =
         protection_level_ >= PROTECTION_ENABLED_EXTENSIONS
             ? protected_preferences
             : unprotected_preferences;
     // |selected_prefs| should never be NULL under the protection level picking
     // it.
     EXPECT_TRUE(selected_prefs);
     base::DictionaryValue* extensions_dict;
     EXPECT_TRUE(selected_prefs->GetDictionary(
         extensions::pref_names::kExtensions, &extensions_dict));
     EXPECT_TRUE(extensions_dict);
 
     // Tamper with any installed setting for good.crx
     base::DictionaryValue* good_crx_dict;
     EXPECT_TRUE(extensions_dict->GetDictionary(kGoodCrxId, &good_crx_dict));
     int good_crx_state;
     EXPECT_TRUE(good_crx_dict->GetInteger("state", &good_crx_state));
     EXPECT_EQ(extensions::Extension::ENABLED, good_crx_state);
     good_crx_dict->SetInteger("state", extensions::Extension::DISABLED);
 
     // Drop a fake extension (for the purpose of this test, dropped settings
     // don't need to be valid extension settings).
     base::DictionaryValue* fake_extension = new base::DictionaryValue;
     fake_extension->SetString("name", "foo");
     extensions_dict->Set(std::string(32, 'a'), fake_extension);
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Expect a single split pref changed report with a count of 2 for tracked
     // pref #5 (extensions).
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceChanged",
                                            BEGIN_ALLOW_SINGLE_BUCKET + 5));
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedSplitPreferenceChanged.extensions.settings",
                   BEGIN_ALLOW_SINGLE_BUCKET + 2));
 
@@ skipping 37 matching lines @@
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedSplitPref, ChangedSplitPref);
 
 // Verifies that adding a value to unprotected preferences for a key which is
 // still using the default (i.e. has no value stored in protected preferences)
 // doesn't allow that value to slip in with no valid MAC (regression test for
 // http://crbug.com/414554)
 class PrefHashBrowserTestUntrustedAdditionToPrefs
     : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     // Ensure there is no user-selected value for kRestoreOnStartup.
     EXPECT_FALSE(
         profile()->GetPrefs()->GetUserPrefValue(prefs::kRestoreOnStartup));
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     unprotected_preferences->SetInteger(prefs::kRestoreOnStartup,
                                         SessionStartupPref::LAST);
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Expect a single Changed event for tracked pref #3 (kRestoreOnStartup) if
     // not protecting; if protection is enabled the change should be a no-op.
     int changed_expected =
         protection_level_ == PROTECTION_DISABLED_FOR_GROUP ? 1 : 0;
     EXPECT_EQ(
         (protection_level_ > PROTECTION_DISABLED_ON_PLATFORM &&
          protection_level_ < PROTECTION_ENABLED_BASIC) ? changed_expected : 0,
         GetTrackedPrefHistogramCount("Settings.TrackedPreferenceChanged",
                                      BEGIN_ALLOW_SINGLE_BUCKET + 3));
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM
@@ skipping 32 matching lines @@
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefs,
                        UntrustedAdditionToPrefs);
 
 // Verifies that adding a value to unprotected preferences while wiping a
 // user-selected value from protected preferences doesn't allow that value to
 // slip in with no valid MAC (regression test for http://crbug.com/414554).
 class PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe
     : public PrefHashBrowserTestBase {
  public:
-  virtual void SetupPreferences() OVERRIDE {
+  virtual void SetupPreferences() override {
     profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com");
   }
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
-      base::DictionaryValue* protected_preferences) OVERRIDE {
+      base::DictionaryValue* protected_preferences) override {
     // Set or change the value in Preferences to the attacker's choice.
     unprotected_preferences->SetString(prefs::kHomePage, "http://example.net");
     // Clear the value in Secure Preferences, if any.
     if (protected_preferences)
       protected_preferences->Remove(prefs::kHomePage, NULL);
   }
 
-  virtual void VerifyReactionToPrefAttack() OVERRIDE {
+  virtual void VerifyReactionToPrefAttack() override {
     // Expect a single Changed event for tracked pref #2 (kHomePage) if
     // not protecting; if protection is enabled the change should be a Cleared.
     int changed_expected =
         protection_level_ > PROTECTION_DISABLED_ON_PLATFORM &&
         protection_level_ < PROTECTION_ENABLED_BASIC
         ? 1 : 0;
     int cleared_expected =
         protection_level_ >= PROTECTION_ENABLED_BASIC
         ? 1 : 0;
     EXPECT_EQ(changed_expected,
@@ skipping 28 matching lines @@
                   "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe,
                        UntrustedAdditionToPrefsAfterWipe);