Add GetExpirationTimes() to HttpResponseHeader.

chrome/browser/net/chrome_network_delegate.cc

 // Copyright (c) 2012 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/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
+#include <limits>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 246 matching lines @@
     Profile* profile) {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&UpdateContentLengthPrefs,
                  received_content_length, original_content_length,
                  data_reduction_type, profile));
 }
 
 void RecordContentLengthHistograms(
     int64 received_content_length,
     int64 original_content_length,
-    const base::TimeDelta& freshness_lifetime) {
+    base::TimeDelta freshness_lifetime,
+    bool has_finite_freshness_lifetime) {
 #if defined(OS_ANDROID)
   // Add the current resource to these histograms only when a valid
   // X-Original-Content-Length header is present.
   if (original_content_length >= 0) {
     UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthWithValidOCL",
                          received_content_length);
     UMA_HISTOGRAM_COUNTS("Net.HttpOriginalContentLengthWithValidOCL",
                          original_content_length);
     UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthDifferenceWithValidOCL",
                          original_content_length - received_content_length);
   } else {
     // Presume the original content length is the same as the received content
     // length if the X-Original-Content-Header is not present.
     original_content_length = received_content_length;
   }
   UMA_HISTOGRAM_COUNTS("Net.HttpContentLength", received_content_length);
   UMA_HISTOGRAM_COUNTS("Net.HttpOriginalContentLength",
                        original_content_length);
   UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthDifference",
                        original_content_length - received_content_length);
+
+  const double freshness_lifetime_seconds =
+      has_finite_freshness_lifetime ? freshness_lifetime.InSeconds() :
+                                      std::numeric_limit<double>::max();
   UMA_HISTOGRAM_CUSTOM_COUNTS("Net.HttpContentFreshnessLifetime",
-                              freshness_lifetime.InSeconds(),
+                              freshness_lifetime_seconds,
                               base::TimeDelta::FromHours(1).InSeconds(),
                               base::TimeDelta::FromDays(30).InSeconds(),
                               100);
   if (freshness_lifetime.InSeconds() <= 0)
     return;
   UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthCacheable",
                        received_content_length);
   if (freshness_lifetime.InHours() < 4)
     return;
   UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthCacheable4Hours",
@@ skipping 261 matching lines @@
 
     if (!request->was_cached() &&         // Don't record cached content
         received_content_length &&        // Zero-byte responses aren't useful.
         (is_http || is_https)) {          // Only record for HTTP or HTTPS urls.
       int64 original_content_length =
           request->response_info().headers->GetInt64HeaderValue(
               "x-original-content-length");
       spdyproxy::DataReductionRequestType data_reduction_type =
           spdyproxy::GetDataReductionRequestType(request);
 
-      base::TimeDelta freshness_lifetime =
-          request->response_info().headers->GetFreshnessLifetime(
-              request->response_info().response_time);
       int64 adjusted_original_content_length =
           spdyproxy::GetAdjustedOriginalContentLength(
               data_reduction_type, original_content_length,
               received_content_length);
       AccumulateContentLength(received_content_length,
                               adjusted_original_content_length,
                               data_reduction_type);
+      base::TimeDelta freshness_lifetime;
+      bool has_finite_freshness_lifetime;
+      request->response_info().headers->GetFreshnessLifetime(
+          request->response_info().response_time,
+          &freshness_lifetime, &has_finite_freshness_lifetime);
       RecordContentLengthHistograms(received_content_length,
                                     original_content_length,
-                                    freshness_lifetime);
+                                    freshness_lifetime,
+                                    has_finite_freshness_lifetime);
       DVLOG(2) << __FUNCTION__
           << " received content length: " << received_content_length
           << " original content length: " << original_content_length
           << " url: " << request->url();
     }
 
     bool is_redirect = request->response_headers() &&
         net::HttpResponseHeaders::IsRedirectResponseCode(
             request->response_headers()->response_code());
     if (!is_redirect) {
@@ skipping 198 matching lines @@
     spdyproxy::DataReductionRequestType data_reduction_type) {
   DCHECK_GE(received_content_length, 0);
   DCHECK_GE(original_content_length, 0);
   StoreAccumulatedContentLength(received_content_length,
                                 original_content_length,
                                 data_reduction_type,
                                 reinterpret_cast<Profile*>(profile_));
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }