Chromium Code Reviews| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h |
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h |
| index fba88eeaed78b12bc3d5a2b24b20357a54818ed4..6e469262f7c0e8e0cbbe5bf6bf8f7fde011a53b4 100644 |
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h |
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h |
| @@ -9,6 +9,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h" |
| #include "net/base/net_util.h" |
| +#include "net/url_request/url_request_context_getter.h" |
|
sclittle
2015/04/02 00:07:00
Could this just be a forward declaration?
tbansal1
2015/04/02 23:21:19
Done.
|
| #include "testing/gmock/include/gmock/gmock.h" |
| namespace base { |
| @@ -37,6 +38,7 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfig { |
| int params_flags, |
| unsigned int params_definitions, |
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, |
| + net::URLRequestContextGetter* request_context_getter, |
| net::NetLog* net_log, |
| DataReductionProxyConfigurator* configurator, |
| DataReductionProxyEventStore* event_store); |
| @@ -45,6 +47,7 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfig { |
| // This permits any DataReductionProxyConfigValues to be used (such as |
| // DataReductionProxyParams or DataReductionProxyMutableConfigValues). |
| TestDataReductionProxyConfig( |
| + net::URLRequestContextGetter* request_context_getter, |
| scoped_ptr<DataReductionProxyConfigValues> config_values, |
| scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| net::NetLog* net_log, |
| @@ -90,6 +93,7 @@ class MockDataReductionProxyConfig : public TestDataReductionProxyConfig { |
| MockDataReductionProxyConfig( |
| scoped_ptr<DataReductionProxyConfigValues> config_values, |
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, |
| + scoped_refptr<net::URLRequestContextGetter> request_context_getter, |
|
sclittle
2015/04/02 00:07:00
nit: maybe change to raw pointer for consistency w
tbansal1
2015/04/02 23:21:19
Done.
|
| net::NetLog* net_log, |
| DataReductionProxyConfigurator* configurator, |
| DataReductionProxyEventStore* event_store); |
| @@ -117,6 +121,10 @@ class MockDataReductionProxyConfig : public TestDataReductionProxyConfig { |
| const net::ProxyConfig& data_reduction_proxy_config, |
| base::TimeDelta* min_retry_delay)); |
| + MOCK_METHOD2(SecureProxyCheck, |
| + void(const GURL& secure_proxy_check_url, |
| + FetcherResponseCallback fetcher_callback)); |
| + |
| // UpdateConfigurator should always call LogProxyState exactly once. |
| void UpdateConfigurator(bool enabled, |
| bool alternative_enabled, |