Update CPAT protocol to send lite-page transform acceptance with ect

components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc

 // Copyright 2015 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/core/browser/data_reduction_proxy_config.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 58 matching lines @@
 // Key of the UMA DataReductionProxy.SecureProxyCheck.Latency histogram.
 const char kUMAProxySecureProxyCheckLatency[] =
     "DataReductionProxy.SecureProxyCheck.Latency";
 
 // Record a network change event.
 void RecordNetworkChangeEvent(DataReductionProxyNetworkChangeEvent event) {
   UMA_HISTOGRAM_ENUMERATION("DataReductionProxy.NetworkChangeEvents", event,
                             CHANGE_EVENT_COUNT);
 }
 
-// Returns a descriptive name corresponding to |connection_type|.
-const char* GetNameForConnectionType(
-    net::NetworkChangeNotifier::ConnectionType connection_type) {
-  switch (connection_type) {
-    case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
-      return "Unknown";
-    case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
-      return "Ethernet";
-    case net::NetworkChangeNotifier::CONNECTION_WIFI:
-      return "WiFi";
-    case net::NetworkChangeNotifier::CONNECTION_2G:
-      return "2G";
-    case net::NetworkChangeNotifier::CONNECTION_3G:
-      return "3G";
-    case net::NetworkChangeNotifier::CONNECTION_4G:
-      return "4G";
-    case net::NetworkChangeNotifier::CONNECTION_NONE:
-      return "None";
-    case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
-      return "Bluetooth";
-  }
-  NOTREACHED();
-  return "";
-}
-
-// Returns an enumerated histogram that should be used to record the given
-// statistic. |max_limit| is the maximum value that can be stored in the
-// histogram. Number of buckets in the enumerated histogram are one more than
-// |max_limit|.
-base::HistogramBase* GetEnumeratedHistogram(
-    base::StringPiece prefix,
-    net::NetworkChangeNotifier::ConnectionType type,
-    int32_t max_limit) {
-  DCHECK_GT(max_limit, 0);
-
-  base::StringPiece name_for_connection_type(GetNameForConnectionType(type));
-  std::string histogram_name;
-  histogram_name.reserve(prefix.size() + name_for_connection_type.size());
-  histogram_name.append(prefix.data(), prefix.size());
-  histogram_name.append(name_for_connection_type.data(),
-                        name_for_connection_type.size());
-
-  return base::Histogram::FactoryGet(
-      histogram_name, 0, max_limit, max_limit + 1,
-      base::HistogramBase::kUmaTargetedHistogramFlag);
-}
-
-// Following UMA is plotted to measure how frequently Lo-Fi state changes.
-// Too frequent changes are undesirable. |connection_type| is the current
-// connection type.
-void RecordAutoLoFiRequestHeaderStateChange(
-    net::NetworkChangeNotifier::ConnectionType connection_type,
-    bool previous_header_low,
-    bool current_header_low) {
-  // Auto Lo-Fi request header state changes.
-  // Possible Lo-Fi header directives are empty ("") and low ("q=low").
-  // This enum must remain synchronized with the enum of the same name in
-  // metrics/histograms/histograms.xml.
-  enum AutoLoFiRequestHeaderState {
-    AUTO_LOFI_REQUEST_HEADER_STATE_EMPTY_TO_EMPTY = 0,
-    AUTO_LOFI_REQUEST_HEADER_STATE_EMPTY_TO_LOW = 1,
-    AUTO_LOFI_REQUEST_HEADER_STATE_LOW_TO_EMPTY = 2,
-    AUTO_LOFI_REQUEST_HEADER_STATE_LOW_TO_LOW = 3,
-    AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY
-  };
-
-  AutoLoFiRequestHeaderState state;
-
-  if (!previous_header_low) {
-    if (current_header_low)
-      state = AUTO_LOFI_REQUEST_HEADER_STATE_EMPTY_TO_LOW;
-    else
-      state = AUTO_LOFI_REQUEST_HEADER_STATE_EMPTY_TO_EMPTY;
-  } else {
-    if (current_header_low) {
-      // Low to low in useful in checking how many consecutive page loads
-      // are done with Lo-Fi enabled.
-      state = AUTO_LOFI_REQUEST_HEADER_STATE_LOW_TO_LOW;
-    } else {
-      state = AUTO_LOFI_REQUEST_HEADER_STATE_LOW_TO_EMPTY;
-    }
-  }
-
-  switch (connection_type) {
-    case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.Unknown", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.Ethernet", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_WIFI:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.WiFi", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_2G:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.2G", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_3G:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.3G", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_4G:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.4G", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_NONE:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.None", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
-      UMA_HISTOGRAM_ENUMERATION(
-          "DataReductionProxy.AutoLoFiRequestHeaderState.Bluetooth", state,
-          AUTO_LOFI_REQUEST_HEADER_STATE_INDEX_BOUNDARY);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-}
-
 //  Records UMA containing the result of requesting the secure proxy check.
 void RecordSecureProxyCheckFetchResult(
     data_reduction_proxy::SecureProxyCheckFetchResult result) {
   UMA_HISTOGRAM_ENUMERATION(
       kUMAProxyProbeURL, result,
       data_reduction_proxy::SECURE_PROXY_CHECK_FETCH_RESULT_COUNT);
 }
 
 }  // namespace
 
@@ skipping 116 matching lines @@
     DataReductionProxyConfigurator* configurator,
     DataReductionProxyEventCreator* event_creator)
     : secure_proxy_allowed_(true),
       unreachable_(false),
       enabled_by_user_(false),
       config_values_(std::move(config_values)),
       io_task_runner_(io_task_runner),
       net_log_(net_log),
       configurator_(configurator),
       event_creator_(event_creator),
-      lofi_effective_connection_type_threshold_(
-          net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN),
-      auto_lofi_hysteresis_(base::TimeDelta::Max()),
-      network_prohibitively_slow_(false),
       connection_type_(net::NetworkChangeNotifier::GetConnectionType()),
-      connection_type_changed_(false),
       lofi_off_(false),
-      network_quality_at_last_query_(NETWORK_QUALITY_AT_LAST_QUERY_UNKNOWN),
-      previous_state_lofi_on_(false),
       is_captive_portal_(false),
       weak_factory_(this) {
   DCHECK(io_task_runner_);
   DCHECK(configurator);
   DCHECK(event_creator);
 
   if (params::IsLoFiDisabledViaFlags())
     SetLoFiModeOff();
   // Constructed on the UI thread, but should be checked on the IO thread.
   thread_checker_.DetachFromThread();
 }
 
 DataReductionProxyConfig::~DataReductionProxyConfig() {
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
 }
 
 void DataReductionProxyConfig::InitializeOnIOThread(
     const scoped_refptr<net::URLRequestContextGetter>&
         basic_url_request_context_getter,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   secure_proxy_checker_.reset(
       new SecureProxyChecker(basic_url_request_context_getter));
   warmup_url_fetcher_.reset(new WarmupURLFetcher(url_request_context_getter));
 
-  PopulateAutoLoFiParams();
   AddDefaultProxyBypassRules();
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
-
-  // Record accuracy at 3 different intervals. The values used here must remain
-  // in sync with the suffixes specified in
-  // tools/metrics/histograms/histograms.xml.
-  lofi_accuracy_recording_intervals_.push_back(
-      base::TimeDelta::FromSeconds(15));
-  lofi_accuracy_recording_intervals_.push_back(
-      base::TimeDelta::FromSeconds(30));
-  lofi_accuracy_recording_intervals_.push_back(
-      base::TimeDelta::FromSeconds(60));
 }
 
 void DataReductionProxyConfig::ReloadConfig() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(configurator_);
 
   if (enabled_by_user_ && !config_values_->holdback() &&
       !config_values_->proxies_for_http().empty()) {
     configurator_->Enable(!secure_proxy_allowed_ || is_captive_portal_,
                           config_values_->proxies_for_http());
@@ skipping 117 matching lines @@
       bypassed = true;
     }
   }
 
   if (min_retry_delay && bypassed)
     *min_retry_delay = min_delay;
 
   return bypassed;
 }
 
-bool DataReductionProxyConfig::IsNetworkQualityProhibitivelySlow(

[bengr, 2017/05/01 16:53:13]

I must be missing something, but I thought you said offline that LoFi would
still be triggered by client logic after this CL. How is that possible if you
are removing all of the triggering logic?

-    const net::NetworkQualityEstimator* network_quality_estimator) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(params::IsIncludedInLoFiEnabledFieldTrial() ||
-         params::IsIncludedInLoFiControlFieldTrial() ||
-         params::IsLoFiSlowConnectionsOnlyViaFlags());
-
-  if (!network_quality_estimator)
-    return false;
-
-  const net::EffectiveConnectionType effective_connection_type =
-      network_quality_estimator->GetEffectiveConnectionType();
-
-  const bool is_network_quality_available =
-      effective_connection_type != net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
-
-  // True only if the network is currently estimated to be slower than the
-  // defined thresholds.
-  const bool is_network_currently_slow =
-      is_network_quality_available &&
-      IsEffectiveConnectionTypeSlowerThanThreshold(effective_connection_type);
-
-  if (is_network_quality_available) {
-    network_quality_at_last_query_ =
-        is_network_currently_slow ? NETWORK_QUALITY_AT_LAST_QUERY_SLOW
-                                  : NETWORK_QUALITY_AT_LAST_QUERY_NOT_SLOW;
-
-    if ((params::IsIncludedInLoFiEnabledFieldTrial() ||
-         params::IsIncludedInLoFiControlFieldTrial()) &&
-        !params::IsLoFiSlowConnectionsOnlyViaFlags()) {
-      // Post tasks to record accuracy of network quality prediction at
-      // different intervals.
-      for (const base::TimeDelta& measuring_delay :
-           GetLofiAccuracyRecordingIntervals()) {
-        io_task_runner_->PostDelayedTask(
-            FROM_HERE,
-            base::Bind(&DataReductionProxyConfig::RecordAutoLoFiAccuracyRate,
-                       weak_factory_.GetWeakPtr(), network_quality_estimator,
-                       measuring_delay),
-            measuring_delay);
-      }
-    }
-  }
-
-  // Return the cached entry if the last update was within the hysteresis
-  // duration and if the connection type has not changed.
-  if (!connection_type_changed_ && !network_quality_last_checked_.is_null() &&
-      GetTicksNow() - network_quality_last_checked_ <= auto_lofi_hysteresis_) {
-    return network_prohibitively_slow_;
-  }
-
-  network_quality_last_checked_ = GetTicksNow();
-  connection_type_changed_ = false;
-
-  if (!is_network_quality_available)
-    return false;
-
-  network_prohibitively_slow_ = is_network_currently_slow;
-  return network_prohibitively_slow_;
-}
-
-void DataReductionProxyConfig::PopulateAutoLoFiParams() {
-  std::string field_trial = params::GetLoFiFieldTrialName();
-
-    // Default parameters to use.
-  const net::EffectiveConnectionType
-      default_effective_connection_type_threshold =
-          net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G;
-  const base::TimeDelta default_hysterisis = base::TimeDelta::FromSeconds(60);
-
-  if (params::IsLoFiSlowConnectionsOnlyViaFlags()) {
-    // Use the default parameters.
-    lofi_effective_connection_type_threshold_ =
-        default_effective_connection_type_threshold;
-    auto_lofi_hysteresis_ = default_hysterisis;
-    field_trial = params::GetLoFiFlagFieldTrialName();
-  }
-
-  if (!params::IsIncludedInLoFiControlFieldTrial() &&
-      !params::IsIncludedInLoFiEnabledFieldTrial() &&
-      !params::IsLoFiSlowConnectionsOnlyViaFlags()) {
-    return;
-  }
-
-  std::string variation_value = variations::GetVariationParamValue(
-      field_trial, "effective_connection_type");
-  if (!variation_value.empty()) {
-    bool effective_connection_type_available =
-        net::GetEffectiveConnectionTypeForName(
-            variation_value, &lofi_effective_connection_type_threshold_);
-    DCHECK(effective_connection_type_available);
-
-    // Silence unused variable warning in release builds.
-    (void)effective_connection_type_available;
-  } else {
-    // Use the default parameters.
-    lofi_effective_connection_type_threshold_ =
-        default_effective_connection_type_threshold;
-  }
-
-  uint32_t auto_lofi_hysteresis_period_seconds;
-  variation_value = variations::GetVariationParamValue(
-      field_trial, "hysteresis_period_seconds");
-  if (!variation_value.empty() &&
-      base::StringToUint(variation_value,
-                         &auto_lofi_hysteresis_period_seconds)) {
-    auto_lofi_hysteresis_ =
-        base::TimeDelta::FromSeconds(auto_lofi_hysteresis_period_seconds);
-  } else {
-    // Use the default parameters.
-    auto_lofi_hysteresis_ = default_hysterisis;
-  }
-  DCHECK_GE(auto_lofi_hysteresis_, base::TimeDelta());
-}
-
 bool DataReductionProxyConfig::IsProxyBypassed(
     const net::ProxyRetryInfoMap& retry_map,
     const net::ProxyServer& proxy_server,
     base::TimeDelta* retry_delay) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   net::ProxyRetryInfoMap::const_iterator found =
       retry_map.find(proxy_server.ToURI());
 
   if (found == retry_map.end() || found->second.bad_until < GetTicksNow()) {
     return false;
@@ skipping 117 matching lines @@
     RecordSecureProxyCheckFetchResult(SUCCEEDED_PROXY_ENABLED);
   } else {
     DCHECK(!secure_proxy_allowed_past && !secure_proxy_allowed_);
     RecordSecureProxyCheckFetchResult(FAILED_PROXY_ALREADY_DISABLED);
   }
 }
 
 void DataReductionProxyConfig::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  connection_type_changed_ = true;
   connection_type_ = type;
   FetchWarmupURL();
 }
 
 void DataReductionProxyConfig::OnIPAddressChanged() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (enabled_by_user_) {
     RecordNetworkChangeEvent(IP_CHANGED);
 
-    // Reset |network_quality_at_last_query_| to prevent recording of network
-    // quality prediction accuracy if there was a change in the IP address.
-    network_quality_at_last_query_ = NETWORK_QUALITY_AT_LAST_QUERY_UNKNOWN;
-
     HandleCaptivePortal();
     // It is safe to use base::Unretained here, since it gets executed
     // synchronously on the IO thread, and |this| outlives
     // |secure_proxy_checker_|.
     SecureProxyCheck(
         config_values_->secure_proxy_check_url(),
         base::Bind(&DataReductionProxyConfig::HandleSecureProxyCheckResponse,
                    base::Unretained(this)));
   }
 }
@@ skipping 48 matching lines @@
     return;
 
   warmup_url_fetcher_->FetchWarmupURL();
 }
 
 void DataReductionProxyConfig::SetLoFiModeOff() {
   DCHECK(thread_checker_.CalledOnValidThread());
   lofi_off_ = true;
 }
 
-void DataReductionProxyConfig::RecordAutoLoFiAccuracyRate(
-    const net::NetworkQualityEstimator* network_quality_estimator,
-    const base::TimeDelta& measuring_duration) const {
+// TODO(dougarnett): Remove once using alt-transforms directive.
+bool DataReductionProxyConfig::IsNetworkQualityProhibitivelySlow(
+    const net::NetworkQualityEstimator* network_quality_estimator) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(network_quality_estimator);
-  DCHECK((params::IsIncludedInLoFiEnabledFieldTrial() ||
-          params::IsIncludedInLoFiControlFieldTrial()) &&
-         !params::IsLoFiSlowConnectionsOnlyViaFlags());
-  DCHECK_EQ(0, measuring_duration.InMilliseconds() % 1000);
-  DCHECK(base::ContainsValue(GetLofiAccuracyRecordingIntervals(),
-                             measuring_duration));
 
-  if (network_quality_at_last_query_ == NETWORK_QUALITY_AT_LAST_QUERY_UNKNOWN)
-    return;
+  if (!network_quality_estimator)
+    return false;
 
-  const base::TimeTicks now = GetTicksNow();
-
-  // Return if the time since |last_query_| is less than |measuring_duration|.
-  // This may happen if another main frame request started during last
-  // |measuring_duration|.
-  if (now - last_query_ < measuring_duration)
-    return;
-
-  // Return if the time since |last_query_| is off by a factor of 2.
-  if (now - last_query_ > 2 * measuring_duration)
-    return;
-
-  const net::EffectiveConnectionType recent_effective_connection_type =
-      network_quality_estimator->GetRecentEffectiveConnectionType(last_query_);
-  if (recent_effective_connection_type ==
-      net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN) {
-    return;
-  }
-
-  // Values of Auto Lo-Fi accuracy.
-  // This enum must remain synchronized with the enum of the same name in
-  // metrics/histograms/histograms.xml.
-  enum AutoLoFiAccuracy {
-    AUTO_LOFI_ACCURACY_ESTIMATED_SLOW_ACTUAL_SLOW = 0,
-    AUTO_LOFI_ACCURACY_ESTIMATED_SLOW_ACTUAL_NOT_SLOW = 1,
-    AUTO_LOFI_ACCURACY_ESTIMATED_NOT_SLOW_ACTUAL_SLOW = 2,
-    AUTO_LOFI_ACCURACY_ESTIMATED_NOT_SLOW_ACTUAL_NOT_SLOW = 3,
-    AUTO_LOFI_ACCURACY_INDEX_BOUNDARY
-  };
-
-  const bool should_have_used_lofi =
-      IsEffectiveConnectionTypeSlowerThanThreshold(
-          recent_effective_connection_type);
-
-  AutoLoFiAccuracy accuracy = AUTO_LOFI_ACCURACY_INDEX_BOUNDARY;
-
-  if (should_have_used_lofi) {
-    if (network_quality_at_last_query_ == NETWORK_QUALITY_AT_LAST_QUERY_SLOW) {
-      accuracy = AUTO_LOFI_ACCURACY_ESTIMATED_SLOW_ACTUAL_SLOW;
-    } else if (network_quality_at_last_query_ ==
-               NETWORK_QUALITY_AT_LAST_QUERY_NOT_SLOW) {
-      accuracy = AUTO_LOFI_ACCURACY_ESTIMATED_NOT_SLOW_ACTUAL_SLOW;
-    } else {
-      NOTREACHED();
-    }
-  } else {
-    if (network_quality_at_last_query_ == NETWORK_QUALITY_AT_LAST_QUERY_SLOW) {
-      accuracy = AUTO_LOFI_ACCURACY_ESTIMATED_SLOW_ACTUAL_NOT_SLOW;
-    } else if (network_quality_at_last_query_ ==
-               NETWORK_QUALITY_AT_LAST_QUERY_NOT_SLOW) {
-      accuracy = AUTO_LOFI_ACCURACY_ESTIMATED_NOT_SLOW_ACTUAL_NOT_SLOW;
-    } else {
-      NOTREACHED();
-    }
-  }
-
-  base::HistogramBase* accuracy_histogram = GetEnumeratedHistogram(
-      base::StringPrintf("DataReductionProxy.LoFi.Accuracy.%d.",
-                         static_cast<int>(measuring_duration.InSeconds())),
-      connection_type_, AUTO_LOFI_ACCURACY_INDEX_BOUNDARY - 1);
-
-  accuracy_histogram->Add(accuracy);
-}
-
-bool DataReductionProxyConfig::IsEffectiveConnectionTypeSlowerThanThreshold(
-    net::EffectiveConnectionType effective_connection_type) const {
+  const net::EffectiveConnectionType effective_connection_type =
+      network_quality_estimator->GetEffectiveConnectionType();
   return effective_connection_type >= net::EFFECTIVE_CONNECTION_TYPE_OFFLINE &&
-         effective_connection_type <= lofi_effective_connection_type_threshold_;
+         effective_connection_type <= net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G;
 }
 
 bool DataReductionProxyConfig::ShouldEnableLoFi(
     const net::URLRequest& request) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK((request.load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED) != 0);
+  DCHECK_NE((request.load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED), 0);
   DCHECK(!request.url().SchemeIsCryptographic());
 
-  net::NetworkQualityEstimator* network_quality_estimator;
-  network_quality_estimator =
-      request.context() ? request.context()->network_quality_estimator()
-                        : nullptr;
-
-  bool enable_lofi = ShouldEnableLoFiInternal(network_quality_estimator);
-
-  if (params::IsLoFiSlowConnectionsOnlyViaFlags() ||
-      params::IsIncludedInLoFiEnabledFieldTrial()) {
-    RecordAutoLoFiRequestHeaderStateChange(
-        connection_type_, previous_state_lofi_on_, enable_lofi);
-    previous_state_lofi_on_ = enable_lofi;
-  }
-
-  return enable_lofi;
-}
-
-bool DataReductionProxyConfig::ShouldEnableLitePages(
-    const net::URLRequest& request) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK((request.load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED) != 0);
-  DCHECK(!request.url().SchemeIsCryptographic());
-
-  return ShouldEnableLitePagesInternal(
-      request.context() ? request.context()->network_quality_estimator()
-                        : nullptr);
-}
-
-bool DataReductionProxyConfig::enabled_by_user_and_reachable() const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  return enabled_by_user_ && !unreachable_;
-}
-
-bool DataReductionProxyConfig::ShouldEnableLoFiInternal(
-    const net::NetworkQualityEstimator* network_quality_estimator) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  last_query_ = GetTicksNow();
-  network_quality_at_last_query_ = NETWORK_QUALITY_AT_LAST_QUERY_UNKNOWN;
-
   // If Lo-Fi has been turned off, its status can't change.
   if (lofi_off_)
     return false;
 
   if (params::IsLoFiAlwaysOnViaFlags())
     return true;
 
   if (params::IsLoFiCellularOnlyViaFlags()) {
     return net::NetworkChangeNotifier::IsConnectionCellular(connection_type_);
   }
 
-  if (params::IsLoFiSlowConnectionsOnlyViaFlags() ||
-      params::IsIncludedInLoFiEnabledFieldTrial() ||
-      params::IsIncludedInLoFiControlFieldTrial()) {
+  net::NetworkQualityEstimator* network_quality_estimator =
+      request.context() ? request.context()->network_quality_estimator()
+                        : nullptr;
+
+  // Handle LitePage fallback case for enabling LoFi.
+  // TODO(dougarnett): Consider if/when we can remove client fallback config.
+  if (ShouldEnableLitePages(request)) {
+    if (!params::IsLitePageFallbackEnabled())
+      return false;
+
+    // TODO(dougarnett): Remove NQE check once using alt-transforms directive
     return IsNetworkQualityProhibitivelySlow(network_quality_estimator);
   }
 
+  if (params::IsLoFiSlowConnectionsOnlyViaFlags() ||
+      params::IsIncludedInLoFiEnabledFieldTrial()) {
+    // TODO(dougarnett): Remove NQE check once using alt-transforms directive
+    return IsNetworkQualityProhibitivelySlow(network_quality_estimator);
+  }
+
   // If Lo-Fi is not enabled through command line and the user is not in
   // Lo-Fi field trials, set Lo-Fi to off.
   lofi_off_ = true;
   return false;
 }
 
-bool DataReductionProxyConfig::ShouldEnableLitePagesInternal(
-    const net::NetworkQualityEstimator* network_quality_estimator) {
+bool DataReductionProxyConfig::ShouldEnableLitePages(
+    const net::URLRequest& request) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_NE((request.load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED), 0);
+  DCHECK(!request.url().SchemeIsCryptographic());
 
   // If Lo-Fi has been turned off, its status can't change. This Lo-Fi bit will
   // be removed when Lo-Fi and Lite Pages are moved over to using the Previews
   // blacklist.
   if (lofi_off_)
     return false;
 
   if (params::IsLoFiAlwaysOnViaFlags() && params::AreLitePagesEnabledViaFlags())
     return true;
 
   if (params::IsLoFiCellularOnlyViaFlags() &&
       params::AreLitePagesEnabledViaFlags()) {
-    return net::NetworkChangeNotifier::IsConnectionCellular(
-        net::NetworkChangeNotifier::GetConnectionType());
+    return net::NetworkChangeNotifier::IsConnectionCellular(connection_type_);
   }
 
   if ((params::IsLoFiSlowConnectionsOnlyViaFlags() &&
        params::AreLitePagesEnabledViaFlags()) ||
-      params::IsIncludedInLitePageFieldTrial() ||
-      params::IsIncludedInLoFiControlFieldTrial()) {
-    return IsNetworkQualityProhibitivelySlow(network_quality_estimator);
+      params::IsIncludedInLitePageFieldTrial()) {
+    return true;
   }
 
   return false;
 }
 
+bool DataReductionProxyConfig::enabled_by_user_and_reachable() const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return enabled_by_user_ && !unreachable_;
+}
+
 void DataReductionProxyConfig::GetNetworkList(
     net::NetworkInterfaceList* interfaces,
     int policy) {
   net::GetNetworkList(interfaces, policy);
 }
 
-const std::vector<base::TimeDelta>&
-DataReductionProxyConfig::GetLofiAccuracyRecordingIntervals() const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  return lofi_accuracy_recording_intervals_;
-}
-
 base::TimeTicks DataReductionProxyConfig::GetTicksNow() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return base::TimeTicks::Now();
 }
 
 net::ProxyConfig DataReductionProxyConfig::ProxyConfigIgnoringHoldback() const {
   if (!enabled_by_user_ || config_values_->proxies_for_http().empty())
     return net::ProxyConfig::CreateDirect();
   return configurator_->CreateProxyConfig(!secure_proxy_allowed_,
                                           config_values_->proxies_for_http());
 }
 
 bool DataReductionProxyConfig::secure_proxy_allowed() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return secure_proxy_allowed_;
 }
 
 std::vector<DataReductionProxyServer>
 DataReductionProxyConfig::GetProxiesForHttp() const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!enabled_by_user_)
     return std::vector<DataReductionProxyServer>();
 
   return config_values_->proxies_for_http();
 }
 
 }  // namespace data_reduction_proxy