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

Unified Diff: chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/extensions/api/push_messaging/push_messaging_canary_test.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
index 1be1505f6c44209f184043259c313259e1d8831e..07bd6852280f3ed56ebc235e3fd9697d3724db02 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
@@ -40,7 +40,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
virtual ~PushMessagingCanaryTest() {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
CommandLine* command_line = CommandLine::ForCurrentProcess();
ASSERT_TRUE(command_line->HasSwitch(kPasswordFileForTest));
@@ -74,7 +74,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
// InProcessBrowserTest override. Destroys the sync client and sync
// profile created by the test. We must clean up ProfileSyncServiceHarness
// now before the profile is cleaned up.
- virtual void TearDownOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() override {
sync_setup_helper_.reset();
}
@@ -85,13 +85,13 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
protected:
// Override InProcessBrowserTest. Change behavior of the default host
// resolver to avoid DNS lookup errors, so we can make network calls.
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
// The resolver object lifetime is managed by sync_test_setup, not here.
EnableDNSLookupForThisTest(
new net::RuleBasedHostResolverProc(host_resolver()));
}
- virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+ virtual void TearDownInProcessBrowserTestFixture() override {
DisableDNSLookupForThisTest();
}

Powered by Google App Engine
This is Rietveld 408576698