| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h
|
| 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 220d081e33a56df2032e182680949695f55492e9..987de6337dbbf8395e24e06d5efe25c19fb791a2 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
|
| @@ -33,8 +33,7 @@ class MockDataReductionProxySettings : public C {
|
| }
|
| MOCK_METHOD0(GetOriginalProfilePrefs, PrefService*());
|
| MOCK_METHOD0(GetLocalStatePrefs, PrefService*());
|
| - MOCK_METHOD1(RecordStartupState,
|
| - void(ProxyStartupState state));
|
| + MOCK_CONST_METHOD1(RecordStartupState, void(ProxyStartupState state));
|
| };
|
|
|
| class DataReductionProxySettingsTestBase : public testing::Test {
|
| @@ -42,9 +41,7 @@ class DataReductionProxySettingsTestBase : public testing::Test {
|
| static void AddTestProxyToCommandLine();
|
|
|
| DataReductionProxySettingsTestBase();
|
| - DataReductionProxySettingsTestBase(bool allowed,
|
| - bool fallback_allowed,
|
| - bool promo_allowed);
|
| + DataReductionProxySettingsTestBase(bool promo_allowed);
|
| ~DataReductionProxySettingsTestBase() override;
|
|
|
| void AddProxyToCommandLine();
|
| @@ -53,13 +50,9 @@ class DataReductionProxySettingsTestBase : public testing::Test {
|
|
|
| template <class C>
|
| void ResetSettings(std::unique_ptr<base::Clock> clock,
|
| - bool allowed,
|
| - bool fallback_allowed,
|
| bool promo_allowed,
|
| bool holdback);
|
| virtual void ResetSettings(std::unique_ptr<base::Clock> clock,
|
| - bool allowed,
|
| - bool fallback_allowed,
|
| bool promo_allowed,
|
| bool holdback) = 0;
|
|
|
| @@ -97,12 +90,10 @@ class ConcreteDataReductionProxySettingsTest
|
| public:
|
| typedef MockDataReductionProxySettings<C> MockSettings;
|
| void ResetSettings(std::unique_ptr<base::Clock> clock,
|
| - bool allowed,
|
| - bool fallback_allowed,
|
| bool promo_allowed,
|
| bool holdback) override {
|
| return DataReductionProxySettingsTestBase::ResetSettings<C>(
|
| - std::move(clock), allowed, fallback_allowed, promo_allowed, holdback);
|
| + std::move(clock), promo_allowed, holdback);
|
| }
|
| };
|
|
|
|
|