Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
index c4928f0cf69a6d9e7e4483e3db11239938c39d12..35c8ecab1313fbd839ba389555d58ccf9178bcf3 100644 |
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
@@ -61,19 +61,11 @@ class TestDataReductionProxySettingsAndroid |
template <class C> |
void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings( |
- std::unique_ptr<base::Clock> clock, |
- bool promo_allowed, |
- bool holdback) { |
- int flags = 0; |
- if (promo_allowed) |
- flags |= DataReductionProxyParams::kPromoAllowed; |
- if (holdback) |
- flags |= DataReductionProxyParams::kHoldback; |
+ std::unique_ptr<base::Clock> clock) { |
MockDataReductionProxySettings<C>* settings = |
new MockDataReductionProxySettings<C>(); |
settings->config_ = test_context_->config(); |
- test_context_->config()->ResetParamFlagsForTest(flags); |
- settings->UpdateConfigValues(); |
+ test_context_->config()->ResetParamFlagsForTest(); |
EXPECT_CALL(*settings, GetOriginalProfilePrefs()) |
.Times(AnyNumber()) |
.WillRepeatedly(Return(test_context_->pref_service())); |
@@ -87,9 +79,7 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings( |
template void |
data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings< |
- DataReductionProxyChromeSettings>(std::unique_ptr<base::Clock> clock, |
- bool promo_allowed, |
- bool holdback); |
+ DataReductionProxyChromeSettings>(std::unique_ptr<base::Clock> clock); |
class DataReductionProxySettingsAndroidTest |
: public data_reduction_proxy::ConcreteDataReductionProxySettingsTest< |