Add data reduction functionality to all platforms.

components/data_reduction_proxy/browser/data_reduction_proxy_metrics.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_metrics.h"
 
 #include "base/metrics/histogram.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_headers.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h"
 #include "net/base/host_port_pair.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 
 namespace data_reduction_proxy {
 
 namespace {
 
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
 // A bypass delay more than this is treated as a long delay.
 const int kLongBypassDelayInSeconds = 30 * 60;
-#endif
 
 // Increments an int64, stored as a string, in a ListPref at the specified
 // index.  The value must already exist and be a string representation of a
 // number.
 void AddInt64ToListPref(size_t index,
                         int64 length,
                         base::ListValue* list_update) {
   int64 value = 0;
   std::string old_string_value;
   bool rv = list_update->GetString(index, &old_string_value);
@@ skipping 254 matching lines @@
 }  // namespace
 
 DataReductionProxyRequestType GetDataReductionProxyRequestType(
     const net::URLRequest* request) {
   if (request->url().SchemeIs("https"))
     return HTTPS;
   if (!request->url().SchemeIs("http")) {
     NOTREACHED();
     return UNKNOWN_TYPE;
   }
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
   DataReductionProxyParams params(
         DataReductionProxyParams::kAllowed |
         DataReductionProxyParams::kFallbackAllowed |
         DataReductionProxyParams::kPromoAllowed);
   base::TimeDelta bypass_delay;
   if (params.AreDataReductionProxiesBypassed(*request, &bypass_delay)) {
     if (bypass_delay > base::TimeDelta::FromSeconds(kLongBypassDelayInSeconds))
       return LONG_BYPASS;
     return SHORT_BYPASS;
   }
-#endif
   if (request->response_info().headers.get() &&
       HasDataReductionProxyViaHeader(request->response_info().headers.get(),
                                      NULL)) {
     return VIA_DATA_REDUCTION_PROXY;
   }
   return UNKNOWN_TYPE;
 }
 
 int64 GetAdjustedOriginalContentLength(
     DataReductionProxyRequestType request_type,
@@ skipping 139 matching lines @@
           https.GetListPrefValue(kNumDaysInHistory - 2),
           short_bypass.GetListPrefValue(kNumDaysInHistory - 2),
           long_bypass.GetListPrefValue(kNumDaysInHistory - 2),
           unknown.GetListPrefValue(kNumDaysInHistory - 2));
     }
   }
 }
 
 void UpdateContentLengthPrefs(int received_content_length,
                               int original_content_length,
-                              bool with_data_reduction_proxy_enabled,
+                              PrefService* profile_prefs,
                               DataReductionProxyRequestType request_type,
                               DataReductionProxyStatisticsPrefs* prefs) {
   int64 total_received = prefs->GetInt64(
       data_reduction_proxy::prefs::kHttpReceivedContentLength);
   int64 total_original = prefs->GetInt64(
       data_reduction_proxy::prefs::kHttpOriginalContentLength);
   total_received += received_content_length;
   total_original += original_content_length;
-  prefs->SetInt64(data_reduction_proxy::prefs::kHttpReceivedContentLength,
-                  total_received);
-  prefs->SetInt64(data_reduction_proxy::prefs::kHttpOriginalContentLength,
-                  total_original);
+  prefs->SetInt64(
+      data_reduction_proxy::prefs::kHttpReceivedContentLength,
+      total_received);
+  prefs->SetInt64(
+      data_reduction_proxy::prefs::kHttpOriginalContentLength,
+      total_original);
 
+  bool with_data_reduction_proxy_enabled =
+      profile_prefs->GetBoolean(
+          data_reduction_proxy::prefs::kDataReductionProxyEnabled);
   UpdateContentLengthPrefsForDataReductionProxy(
       received_content_length,
       original_content_length,
       with_data_reduction_proxy_enabled,
       request_type,
       base::Time::Now(),
       prefs);
 }
 
 }  // namespace data_reduction_proxy