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

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

Issue 1132083004: Enable an option to only use the secure Data Reduction Proxy when the secure proxy check succeeds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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_config_test_utils.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
index f614e93a8b9b9174a6bd18b1f90c1d8ceb6a8af6..a9950ce60d001964927a8f9a3716f7ee4a0fe008 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
@@ -77,10 +77,10 @@ DataReductionProxyConfigValues* TestDataReductionProxyConfig::config_values() {
void TestDataReductionProxyConfig::SetStateForTest(
bool enabled_by_user,
bool alternative_enabled_by_user,
- bool restricted_by_carrier) {
+ bool secure_proxy_allowed) {
enabled_by_user_ = enabled_by_user;
alternative_enabled_by_user_ = alternative_enabled_by_user;
- restricted_by_carrier_ = restricted_by_carrier;
+ secure_proxy_allowed_ = secure_proxy_allowed;
}
MockDataReductionProxyConfig::MockDataReductionProxyConfig(
@@ -99,11 +99,12 @@ MockDataReductionProxyConfig::~MockDataReductionProxyConfig() {
void MockDataReductionProxyConfig::UpdateConfigurator(bool enabled,
bool alternative_enabled,
- bool restricted,
+ bool secure_proxy_allowed,
bool at_startup) {
- EXPECT_CALL(*this, LogProxyState(enabled, restricted, at_startup)).Times(1);
- DataReductionProxyConfig::UpdateConfigurator(enabled, alternative_enabled,
- restricted, at_startup);
+ EXPECT_CALL(*this, LogProxyState(enabled, secure_proxy_allowed, at_startup))
+ .Times(1);
+ DataReductionProxyConfig::UpdateConfigurator(
+ enabled, alternative_enabled, secure_proxy_allowed, at_startup);
}
} // namespace data_reduction_proxy

Powered by Google App Engine
This is Rietveld 408576698