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

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

Issue 2626963003: Remove kAllowed and kFallbackAllowed from data reduction proxy (Closed)
Patch Set: Addressed nits Created 3 years, 11 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_settings.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
index 4e6cb863dbe8b40a2ddad472bddf17b83f37dffa..fecd6ea13ef0ef20b6636592f8014e8c1ba0b7b5 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
@@ -52,7 +52,6 @@ const char kDataReductionPassThroughHeader[] =
DataReductionProxySettings::DataReductionProxySettings()
: unreachable_(false),
deferred_initialization_(false),
- allowed_(false),
promo_allowed_(false),
lo_fi_mode_active_(false),
lo_fi_load_image_requested_(false),
@@ -69,8 +68,7 @@ DataReductionProxySettings::DataReductionProxySettings()
}
DataReductionProxySettings::~DataReductionProxySettings() {
- if (allowed_)
- spdy_proxy_auth_enabled_.Destroy();
+ spdy_proxy_auth_enabled_.Destroy();
}
void DataReductionProxySettings::InitPrefMembers() {
@@ -83,7 +81,6 @@ void DataReductionProxySettings::InitPrefMembers() {
void DataReductionProxySettings::UpdateConfigValues() {
DCHECK(config_);
- allowed_ = config_->allowed();
promo_allowed_ = config_->promo_allowed();
}
@@ -144,10 +141,6 @@ bool DataReductionProxySettings::IsDataReductionProxyManaged() {
void DataReductionProxySettings::SetDataReductionProxyEnabled(bool enabled) {
DCHECK(thread_checker_.CalledOnValidThread());
- // Prevent configuring the proxy when it is not allowed to be used.
- if (!allowed_)
- return;
-
if (spdy_proxy_auth_enabled_.GetValue() != enabled) {
spdy_proxy_auth_enabled_.SetValue(enabled);
OnProxyEnabledPrefChange();
@@ -240,8 +233,6 @@ void DataReductionProxySettings::OnProxyEnabledPrefChange() {
if (!register_synthetic_field_trial_.is_null()) {
RegisterDataReductionProxyFieldTrial();
}
- if (!allowed_)
- return;
MaybeActivateDataReductionProxy(false);
}
@@ -330,20 +321,14 @@ DataReductionProxyEventStore* DataReductionProxySettings::GetEventStore()
}
// Metrics methods
-void DataReductionProxySettings::RecordDataReductionInit() {
+void DataReductionProxySettings::RecordDataReductionInit() const {
DCHECK(thread_checker_.CalledOnValidThread());
- ProxyStartupState state = PROXY_NOT_AVAILABLE;
- if (allowed_) {
- if (IsDataReductionProxyEnabled())
- state = PROXY_ENABLED;
- else
- state = PROXY_DISABLED;
- }
-
- RecordStartupState(state);
+ RecordStartupState(IsDataReductionProxyEnabled() ? PROXY_ENABLED
+ : PROXY_DISABLED);
}
-void DataReductionProxySettings::RecordStartupState(ProxyStartupState state) {
+void DataReductionProxySettings::RecordStartupState(
+ ProxyStartupState state) const {
UMA_HISTOGRAM_ENUMERATION(kUMAProxyStartupStateHistogram,
state,
PROXY_STARTUP_STATE_COUNT);

Powered by Google App Engine
This is Rietveld 408576698