Adding synthetic field trial for DataReductionProxyEnabled

components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 113 matching lines @@
     net::URLRequestContextGetter* url_request_context_getter) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(prefs);
   DCHECK(local_state_prefs);
   DCHECK(url_request_context_getter);
   prefs_ = prefs;
   local_state_prefs_ = local_state_prefs;
   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;
 
   AddDefaultProxyBypassRules();
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
 
   // We set or reset the proxy pref at startup.
   MaybeActivateDataReductionProxy(true);
 }
 
 void DataReductionProxySettings::InitDataReductionProxySettings(
     PrefService* prefs,
     PrefService* local_state_prefs,
     net::URLRequestContextGetter* url_request_context_getter,
     scoped_ptr<DataReductionProxyConfigurator> configurator) {
   InitDataReductionProxySettings(prefs,
                                  local_state_prefs,
                                  url_request_context_getter);
   SetProxyConfigurator(configurator.Pass());
 }
 
+void DataReductionProxySettings::SetOnDataReductionEnabledCallback(
+    const base::Callback<void(bool)>& on_data_reduction_proxy_enabled) {
+  on_data_reduction_proxy_enabled_ = on_data_reduction_proxy_enabled;
+  on_data_reduction_proxy_enabled_.Run(IsDataReductionProxyEnabled());

[bengr, 2014/07/30 23:42:07]

Is this needed?

[megjablon, 2014/07/30 23:57:06]

Yes, because we want the synthetic field trial set as soon as we have access to
the callback and then it will be toggled every time thereafter by
OnProxyEnabledPrefChange.

+}
+
 void DataReductionProxySettings::SetProxyConfigurator(
     scoped_ptr<DataReductionProxyConfigurator> configurator) {
   DCHECK(configurator);
   configurator_ = configurator.Pass();
 }
 
 bool DataReductionProxySettings::IsDataReductionProxyEnabled() {
   return spdy_proxy_auth_enabled_.GetValue() || IsEnabledOnCommandLine();
 }
 
@@ skipping 185 matching lines @@
     RecordNetworkChangeEvent(IP_CHANGED);
     if (DisableIfVPN())
       return;
     ProbeWhetherDataReductionProxyIsAvailable();
     WarmProxyConnection();
   }
 }
 
 void DataReductionProxySettings::OnProxyEnabledPrefChange() {
   DCHECK(thread_checker_.CalledOnValidThread());
+  if (!on_data_reduction_proxy_enabled_.is_null())
+    on_data_reduction_proxy_enabled_.Run(IsDataReductionProxyEnabled());
   if (!params_->allowed())
     return;
   MaybeActivateDataReductionProxy(false);
 }
 
 void DataReductionProxySettings::OnProxyAlternativeEnabledPrefChange() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!params_->alternative_allowed())
     return;
   MaybeActivateDataReductionProxy(false);
@@ skipping 232 matching lines @@
     SetProxyConfigs(enabled_by_user_,
                     IsDataReductionProxyAlternativeEnabled(),
                     restricted_by_carrier_,
                     false);
   }
   disabled_on_vpn_ = false;
   return false;
 }
 
 }  // namespace data_reduction_proxy