From 79ff566325268a34a0ce078dbda3ea68d21850de Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 28 Apr 2015 10:22:22 -0700 Subject: Update {virtual,override} to follow C++11 style in components. The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1056633004 Cr-Commit-Position: refs/heads/master@{#327312} --- .../core/browser/data_reduction_proxy_settings_test_utils.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/data_reduction_proxy') diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h index dc5ec7f..12ef1f7 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h @@ -98,11 +98,11 @@ class ConcreteDataReductionProxySettingsTest : public DataReductionProxySettingsTestBase { public: typedef MockDataReductionProxySettings MockSettings; - virtual void ResetSettings(bool allowed, - bool fallback_allowed, - bool alt_allowed, - bool promo_allowed, - bool holdback) override { + void ResetSettings(bool allowed, + bool fallback_allowed, + bool alt_allowed, + bool promo_allowed, + bool holdback) override { return DataReductionProxySettingsTestBase::ResetSettings( allowed, fallback_allowed, alt_allowed, promo_allowed, holdback); } -- cgit v1.1