| 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 07bd6852280f3ed56ebc235e3fd9697d3724db02..9777a4dc9e05bab8c2a63f7ed326b7d1f79410ff 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
|
| @@ -74,9 +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 {
|
| - sync_setup_helper_.reset();
|
| - }
|
| + void TearDownOnMainThread() override { sync_setup_helper_.reset(); }
|
|
|
| const SyncSetupHelper* sync_setup_helper() const {
|
| return sync_setup_helper_.get();
|
| @@ -85,13 +83,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 {
|
| + 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 {
|
| + void TearDownInProcessBrowserTestFixture() override {
|
| DisableDNSLookupForThisTest();
|
| }
|
|
|
|
|