Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc

Issue 981633002: Created new URLRequestContext for secure proxy check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved Secure Proxy check to separate class. Addressed comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 aae60c37771330e008cf99364f820c5d47a6fed2..3e9220365fe4dfaad7c3a97301599d311f24fe1a 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
@@ -161,10 +161,9 @@ TestDataReductionProxyConfigServiceClient::TestBackoffEntry::ImplGetTimeNow()
MockDataReductionProxyService::MockDataReductionProxyService(
scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs,
- DataReductionProxySettings* settings,
- net::URLRequestContextGetter* request_context)
+ DataReductionProxySettings* settings)
: DataReductionProxyService(
- statistics_prefs.Pass(), settings, request_context) {
+ statistics_prefs.Pass(), settings) {
}
MockDataReductionProxyService::~MockDataReductionProxyService() {
@@ -335,17 +334,17 @@ DataReductionProxyTestContext::Builder::Build() {
params.get());
raw_mutable_config = mutable_config.get();
config.reset(new TestDataReductionProxyConfig(
- mutable_config.Pass(), task_runner, net_log.get(), configurator.get(),
- event_store.get()));
+ request_context_getter.get(), mutable_config.Pass(), task_runner,
+ net_log.get(), configurator.get(), event_store.get()));
} else if (use_mock_config_) {
test_context_flags |= USE_MOCK_CONFIG;
config.reset(new MockDataReductionProxyConfig(
- params.Pass(), task_runner, net_log.get(), configurator.get(),
- event_store.get()));
+ params.Pass(), task_runner, request_context_getter, net_log.get(),
+ configurator.get(), event_store.get()));
} else {
config.reset(new TestDataReductionProxyConfig(
- params.Pass(), task_runner, net_log.get(), configurator.get(),
- event_store.get()));
+ request_context_getter.get(), params.Pass(), task_runner,
+ net_log.get(), configurator.get(), event_store.get()));
}
scoped_ptr<DataReductionProxyRequestOptions> request_options;
@@ -456,12 +455,11 @@ DataReductionProxyTestContext::CreateDataReductionProxyServiceInternal() {
if (test_context_flags_ & DataReductionProxyTestContext::USE_MOCK_SERVICE) {
return make_scoped_ptr(new MockDataReductionProxyService(
- statistics_prefs.Pass(), settings_.get(),
- request_context_getter_.get()));
+ statistics_prefs.Pass(), settings_.get()));
} else {
return make_scoped_ptr(
- new DataReductionProxyService(statistics_prefs.Pass(), settings_.get(),
- request_context_getter_.get()));
+ new DataReductionProxyService(statistics_prefs.Pass(),
+ settings_.get()));
}
}

Powered by Google App Engine
This is Rietveld 408576698