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

Unified Diff: chrome/browser/policy/url_blacklist_manager_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
Index: chrome/browser/policy/url_blacklist_manager_unittest.cc
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index 5bfed61fec403e0eb226bd9ff330c902d5e0d721..3d521b68e8764ec23b6771e9c2dd0b682e407b1a 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -66,12 +66,12 @@ class TestingURLBlacklistManager : public URLBlacklistManager {
}
// URLBlacklistManager overrides:
- virtual void SetBlacklist(scoped_ptr<URLBlacklist> blacklist) OVERRIDE {
+ virtual void SetBlacklist(scoped_ptr<URLBlacklist> blacklist) override {
set_blacklist_called_ = true;
URLBlacklistManager::SetBlacklist(blacklist.Pass());
}
- virtual void Update() OVERRIDE {
+ virtual void Update() override {
update_called_++;
URLBlacklistManager::Update();
}
@@ -90,14 +90,14 @@ class URLBlacklistManagerTest : public testing::Test {
protected:
URLBlacklistManagerTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist);
pref_service_.registry()->RegisterListPref(policy_prefs::kUrlWhitelist);
blacklist_manager_.reset(new TestingURLBlacklistManager(&pref_service_));
loop_.RunUntilIdle();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
if (blacklist_manager_.get())
blacklist_manager_->ShutdownOnUIThread();
loop_.RunUntilIdle();
« no previous file with comments | « chrome/browser/policy/test/local_policy_test_server.h ('k') | chrome/browser/power/process_power_collector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698