Support for new data reduction proxy via header

chrome/browser/net/spdyproxy/data_saving_metrics.cc

 // Copyright 2013 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 "chrome/browser/net/spdyproxy/data_saving_metrics.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 330 matching lines @@
     }
   }
   if (delay_seconds != NULL)
     *delay_seconds = shortest_delay;
   return true;
 #else
   return false;
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
-// IsDataReductionProxyReponse returns true if response_headers contains the
-// data reduction proxy Via header value.
-bool IsDataReductionProxyReponse(
-    const net::HttpResponseHeaders* response_headers) {
-  const char kDatReductionProxyViaValue[] = "1.1 Chrome Compression Proxy";
-  size_t value_len = strlen(kDatReductionProxyViaValue);
-  void* iter = NULL;
-  std::string temp;
-  while (response_headers->EnumerateHeader(&iter, "Via", &temp)) {
-    string::const_iterator it =
-        std::search(temp.begin(),
-                    temp.end(),
-                    kDatReductionProxyViaValue,
-                    kDatReductionProxyViaValue + value_len,
-                    base::CaseInsensitiveCompareASCII<char>());
-    if (it != temp.end()) {
-      return true;
-    }
-  }
-  return false;
-}
-
 }  // namespace
 
 namespace spdyproxy {
 
 DataReductionRequestType GetDataReductionRequestType(
     const net::URLRequest* request) {
   if (request->url().SchemeIs(content::kHttpsScheme))
     return HTTPS;
   if (!request->url().SchemeIs(content::kHttpScheme)) {
     NOTREACHED();
     return UNKNOWN_TYPE;
   }
   int64 bypass_delay = 0;
   if (IsBypassRequest(request, &bypass_delay)) {
     return (bypass_delay > kLongBypassDelayInSeconds) ?
       LONG_BYPASS : SHORT_BYPASS;
   }
-  return IsDataReductionProxyReponse(request->response_info().headers) ?
-    VIA_DATA_REDUCTION_PROXY: UNKNOWN_TYPE;
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+  if (request->response_info().headers &&
+      request->response_info().headers->IsChromeProxyResponse()) {
+    return VIA_DATA_REDUCTION_PROXY;
+  }
+#endif
+  return UNKNOWN_TYPE;
 }
 
 int64 GetAdjustedOriginalContentLength(
     DataReductionRequestType data_reduction_type,
     int64 original_content_length,
     int64 received_content_length) {
   // Since there was no indication of the original content length, presume
   // it is no different from the number of bytes read.
   if (original_content_length == -1 ||
       data_reduction_type != spdyproxy::VIA_DATA_REDUCTION_PROXY) {
@@ skipping 140 matching lines @@
       original_content_length,
       with_data_reduction_proxy_enabled,
       data_reduction_type,
       base::Time::Now(),
       prefs);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
 }
 
 }  // namespace spdyproxy