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 103 matching lines @@
       prefs::kDataReductionProxyAltEnabled,
       GetOriginalProfilePrefs(),
       base::Bind(
           &DataReductionProxySettings::OnProxyAlternativeEnabledPrefChange,
           base::Unretained(this)));
 }
 
 void DataReductionProxySettings::InitDataReductionProxySettings(
     PrefService* prefs,
     PrefService* local_state_prefs,
-    net::URLRequestContextGetter* url_request_context_getter) {
+    net::URLRequestContextGetter* url_request_context_getter,
+    const base::Callback<void(bool)>& on_data_reduction_proxy_enabled) {

[bengr, 2014/07/30 19:08:22]

This is fine, but eventually we should move to adding an observer.

   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;
+  on_data_reduction_proxy_enabled_ = on_data_reduction_proxy_enabled;
   InitPrefMembers();
   RecordDataReductionInit();
+
+  on_data_reduction_proxy_enabled_.Run(IsDataReductionProxyEnabled());
+
   // 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) {
+    scoped_ptr<DataReductionProxyConfigurator> configurator,
+    const base::Callback<void(bool)>& on_data_reduction_proxy_enabled) {
   InitDataReductionProxySettings(prefs,
                                  local_state_prefs,
-                                 url_request_context_getter);
+                                 url_request_context_getter,
+                                 on_data_reduction_proxy_enabled);
   SetProxyConfigurator(configurator.Pass());
 }
 
 void DataReductionProxySettings::SetProxyConfigurator(
     scoped_ptr<DataReductionProxyConfigurator> configurator) {
   DCHECK(configurator);
   configurator_ = configurator.Pass();
 }
 
 bool DataReductionProxySettings::IsDataReductionProxyEnabled() {
@@ skipping 10 matching lines @@
 }
 
 void DataReductionProxySettings::SetDataReductionProxyEnabled(bool enabled) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Prevent configuring the proxy when it is not allowed to be used.
   if (!params_->allowed())
     return;
 
   if (spdy_proxy_auth_enabled_.GetValue() != enabled) {
     spdy_proxy_auth_enabled_.SetValue(enabled);
+    on_data_reduction_proxy_enabled_.Run(IsDataReductionProxyEnabled());

[bengr, 2014/07/30 19:08:22]

I think this should be done in OnProxyEnabledPrefChange.

[megjablon, 2014/07/30 21:27:07]

Done.

     OnProxyEnabledPrefChange();
   }
 }
 
 void DataReductionProxySettings::SetDataReductionProxyAlternativeEnabled(
     bool enabled) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Prevent configuring the proxy when it is not allowed to be used.
   if (!params_->alternative_allowed())
     return;
@@ skipping 410 matching lines @@
     SetProxyConfigs(enabled_by_user_,
                     IsDataReductionProxyAlternativeEnabled(),
                     restricted_by_carrier_,
                     false);
   }
   disabled_on_vpn_ = false;
   return false;
 }
 
 }  // namespace data_reduction_proxy