Disable fallback support for alternative data reduction proxy

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 321 matching lines @@
                << " " << (at_startup ? kAtStartup : kByUser);
 }
 
 void DataReductionProxySettings::OnIPAddressChanged() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (enabled_by_user_) {
     DCHECK(params_->allowed());
     RecordNetworkChangeEvent(IP_CHANGED);
     if (DisableIfVPN())
       return;
+    if (IsDataReductionProxyAlternativeEnabled() &&
+        !params_->alternative_fallback_allowed()) {
+      return;
+    }
     ProbeWhetherDataReductionProxyIsAvailable();
   }
 }
 
 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;
@@ skipping 34 matching lines @@
     ResetDataReductionStatistics();
   }
   // Configure use of the data reduction proxy if it is enabled.
   enabled_by_user_= IsDataReductionProxyEnabled();
   SetProxyConfigs(enabled_by_user_ && !disabled_on_vpn_,
                   IsDataReductionProxyAlternativeEnabled(),
                   restricted_by_carrier_,
                   at_startup);
 
   // Check if the proxy has been restricted explicitly by the carrier.
-  if (enabled_by_user_ && !disabled_on_vpn_) {
+  if (enabled_by_user_ && !disabled_on_vpn_ &&
+      !(IsDataReductionProxyAlternativeEnabled() &&
+        !params_->alternative_fallback_allowed())) {
     ProbeWhetherDataReductionProxyIsAvailable();
   }
 }
 
 void DataReductionProxySettings::SetProxyConfigs(bool enabled,
                                                  bool alternative_enabled,
                                                  bool restricted,
                                                  bool at_startup) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(configurator_);
 
   LogProxyState(enabled, restricted, at_startup);
   // The alternative is only configured if the standard configuration is
   // is enabled.
   if (enabled & !params_->holdback()) {
     if (alternative_enabled) {
       configurator_->Enable(restricted,
-                            !params_->fallback_allowed(),
+                            !params_->alternative_fallback_allowed(),
                             params_->alt_origin().spec(),
-                            params_->alt_fallback_origin().spec(),
+                            std::string(),
                             params_->ssl_origin().spec());
     } else {
       configurator_->Enable(restricted,
                             !params_->fallback_allowed(),
                             params_->origin().spec(),
                             params_->fallback_origin().spec(),
                             std::string());
     }
   } else {
     configurator_->Disable();
@@ skipping 147 matching lines @@
     SetProxyConfigs(enabled_by_user_,
                     IsDataReductionProxyAlternativeEnabled(),
                     restricted_by_carrier_,
                     false);
   }
   disabled_on_vpn_ = false;
   return false;
 }
 
 }  // namespace data_reduction_proxy