Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc |
index 89288674feb494e5ffffae8bd6cc391615ca90e7..18f87408f5b7e4ea6ac209e9a8d4c85ee4485a0c 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc |
@@ -44,10 +44,18 @@ ProbeURLFetchResult FetchResult(bool enabled, bool success) { |
return FAILED_PROXY_ALREADY_DISABLED; |
} |
-TestDataReductionProxyConfig::TestDataReductionProxyConfig() |
- : enabled_(false), |
+TestDataReductionProxyConfig::TestDataReductionProxyConfig( |
+ scoped_refptr<base::SequencedTaskRunner> network_task_runner, |
+ net::NetLog* net_log, |
+ data_reduction_proxy::DataReductionProxyEventStore* event_store) |
+ : DataReductionProxyConfigurator(network_task_runner, net_log, event_store), |
+ enabled_(false), |
restricted_(false), |
- fallback_restricted_(false) {} |
+ fallback_restricted_(false) { |
+} |
+ |
+TestDataReductionProxyConfig::~TestDataReductionProxyConfig() { |
+} |
void TestDataReductionProxyConfig::Enable( |
bool restricted, |
@@ -73,7 +81,8 @@ void TestDataReductionProxyConfig::Disable() { |
} |
DataReductionProxySettingsTestBase::DataReductionProxySettingsTestBase() |
- : testing::Test() {} |
+ : testing::Test() { |
+} |
DataReductionProxySettingsTestBase::~DataReductionProxySettingsTestBase() {} |
@@ -152,7 +161,9 @@ void DataReductionProxySettingsTestBase::ResetSettings(bool allowed, |
EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0); |
EXPECT_CALL(*settings, LogProxyState(_, _, _)).Times(0); |
settings_.reset(settings); |
- configurator_.reset(new TestDataReductionProxyConfig()); |
+ configurator_.reset(new TestDataReductionProxyConfig( |
+ scoped_refptr<base::TestSimpleTaskRunner>( |
+ new base::TestSimpleTaskRunner()), &net_log_, event_store_.get())); |
settings_->configurator_ = configurator_.get(); |
settings_->SetDataReductionProxyStatisticsPrefs(statistics_prefs_.get()); |
} |
@@ -280,7 +291,10 @@ void DataReductionProxySettingsTestBase::CheckInitDataReductionProxy( |
bool enabled_at_startup) { |
base::MessageLoopForUI loop; |
scoped_ptr<DataReductionProxyConfigurator> configurator( |
- new TestDataReductionProxyConfig()); |
+ new TestDataReductionProxyConfig( |
+ scoped_refptr<base::TestSimpleTaskRunner>( |
+ new base::TestSimpleTaskRunner()), &net_log_, |
+ event_store_.get())); |
settings_->SetProxyConfigurator(configurator.get()); |
scoped_refptr<net::TestURLRequestContextGetter> request_context = |
new net::TestURLRequestContextGetter(base::MessageLoopProxy::current()); |