Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc |
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc |
index 1d1d70f6abbae11a3f675039a8c0eb5a8e8cabfe..7fc8138de326a4baa481d2642762af870fa2470a 100644 |
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc |
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc |
@@ -127,7 +127,6 @@ void DataReductionProxySettings::InitDataReductionProxySettings( |
url_request_context_getter_ = url_request_context_getter; |
InitPrefMembers(); |
RecordDataReductionInit(); |
- |
// Disable the proxy if it is not allowed to be used. |
if (!params_->allowed()) |
return; |
@@ -376,7 +375,6 @@ void DataReductionProxySettings::MaybeActivateDataReductionProxy( |
prefs->SetBoolean(prefs::kDataReductionProxyWasEnabledBefore, true); |
ResetDataReductionStatistics(); |
} |
- |
// Configure use of the data reduction proxy if it is enabled. |
enabled_by_user_= IsDataReductionProxyEnabled(); |
SetProxyConfigs(enabled_by_user_ && !disabled_on_vpn_, |
@@ -399,7 +397,7 @@ void DataReductionProxySettings::SetProxyConfigs(bool enabled, |
LogProxyState(enabled, restricted, at_startup); |
// The alternative is only configured if the standard configuration is |
// is enabled. |
- if (enabled) { |
+ if (enabled & !params_->holdback()) { |
if (alternative_enabled) { |
configurator_->Enable(restricted, |
!params_->fallback_allowed(), |