Chromium Code Reviews| Index: chrome/browser/prefs/proxy_policy_unittest.cc |
| diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc |
| index f22b3c3a5f983fef9a6a0e894025737ec5436566..7e20c33d30e755bb5ac528b7c5fd96c0e8242b8c 100644 |
| --- a/chrome/browser/prefs/proxy_policy_unittest.cc |
| +++ b/chrome/browser/prefs/proxy_policy_unittest.cc |
| @@ -84,7 +84,7 @@ class ProxyPolicyTest : public testing::Test { |
| ProxyPolicyTest() |
| : command_line_(CommandLine::NO_PROGRAM) {} |
| - virtual void SetUp() override { |
| + void SetUp() override { |
| EXPECT_CALL(provider_, IsInitializationComplete(_)) |
| .WillRepeatedly(Return(true)); |
| @@ -94,9 +94,7 @@ class ProxyPolicyTest : public testing::Test { |
| provider_.Init(); |
| } |
| - virtual void TearDown() override { |
| - provider_.Shutdown(); |
| - } |
| + void TearDown() override { provider_.Shutdown(); } |
|
James Hawkins
2014/10/28 23:04:23
Undo this pull-up.
|
| scoped_ptr<PrefService> CreatePrefService(bool with_managed_policies) { |
| PrefServiceMockFactory factory; |