Chromium Code Reviews| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc |
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc |
| index f070f139fb73b30d27b1830cd9c324dc5e6655da..46c91cf81fc8cbd20d763515310fe6fcbb3d5b6e 100644 |
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc |
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc |
| @@ -178,7 +178,8 @@ TestDataReductionProxyIOData::TestDataReductionProxyIOData( |
| scoped_ptr<DataReductionProxyEventCreator> event_creator, |
| scoped_ptr<DataReductionProxyRequestOptions> request_options, |
| scoped_ptr<DataReductionProxyConfigurator> configurator, |
| - scoped_ptr<DataReductionProxyConfigServiceClient> config_client) |
| + scoped_ptr<DataReductionProxyConfigServiceClient> config_client, |
| + bool enabled) |
| : DataReductionProxyIOData() { |
| io_task_runner_ = task_runner; |
| ui_task_runner_ = task_runner; |
| @@ -192,10 +193,10 @@ TestDataReductionProxyIOData::TestDataReductionProxyIOData( |
| base::Unretained(this)))); |
| io_task_runner_ = task_runner; |
| ui_task_runner_ = task_runner; |
| + enabled_ = enabled; |
|
bengr
2015/04/27 20:04:49
Why not call enabled_'s constructor: enabled_(enab
|
| } |
| TestDataReductionProxyIOData::~TestDataReductionProxyIOData() { |
| - shutdown_on_ui_ = true; |
| } |
| DataReductionProxyTestContext::Builder::Builder() |
| @@ -388,8 +389,8 @@ DataReductionProxyTestContext::Builder::Build() { |
| scoped_ptr<TestDataReductionProxyIOData> io_data( |
| new TestDataReductionProxyIOData( |
| task_runner, config.Pass(), event_creator.Pass(), |
| - request_options.Pass(), configurator.Pass(), config_client.Pass())); |
| - io_data->InitOnUIThread(pref_service.get()); |
| + request_options.Pass(), configurator.Pass(), config_client.Pass(), |
| + true /* enabled */)); |
| io_data->SetSimpleURLRequestContextGetter(request_context_getter); |
| scoped_ptr<DataReductionProxyTestContext> test_context( |