Post-commit fixes for "stale-while-revalidate..."

net/http/http_response_headers.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 #define NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
 namespace base {
 class Time;
 class TimeDelta;
 }
 
 namespace net {
 
 class HttpByteRange;
 
 enum ValidationType {
-  VALIDATION_NONE = 0,      // The resource is fresh.
+  VALIDATION_NONE,          // The resource is fresh.
   VALIDATION_ASYNCHRONOUS,  // The resource requires async revalidation.
   VALIDATION_SYNCHRONOUS    // The resource requires sync revalidation.
 };
 
 // HttpResponseHeaders: parses and holds HTTP response headers.
 class NET_EXPORT HttpResponseHeaders
     : public base::RefCountedThreadSafe<HttpResponseHeaders> {
  public:
   // Persist options.
   typedef int PersistOptions;
   static const PersistOptions PERSIST_RAW = -1;  // Raw, unparsed headers.
   static const PersistOptions PERSIST_ALL = 0;  // Parsed headers.
   static const PersistOptions PERSIST_SANS_COOKIES = 1 << 0;
   static const PersistOptions PERSIST_SANS_CHALLENGES = 1 << 1;
   static const PersistOptions PERSIST_SANS_HOP_BY_HOP = 1 << 2;
   static const PersistOptions PERSIST_SANS_NON_CACHEABLE = 1 << 3;
   static const PersistOptions PERSIST_SANS_RANGES = 1 << 4;
   static const PersistOptions PERSIST_SANS_SECURITY_STATE = 1 << 5;
 
   struct FreshnessLifetimes {
     // How long the resource will be fresh for.
-    base::TimeDelta fresh;
+    base::TimeDelta freshness;
     // How long after becoming not fresh that the resource will be stale but
     // usable (if async revalidation is enabled).
-    base::TimeDelta stale;
+    base::TimeDelta staleness;
   };
 
   static const char kContentRange[];
 
   // Parses the given raw_headers.  raw_headers should be formatted thus:
   // includes the http status response line, each line is \0-terminated, and
   // it's terminated by an empty line (ie, 2 \0s in a row).
   // (Note that line continuations should have already been joined;
   // see HttpUtil::AssembleRawHeaders)
   //
@@ skipping 154 matching lines @@
   // The result is relative to the current_time parameter, which is
   // a parameter to support unit testing.  The request_time parameter indicates
   // the time at which the request was made that resulted in this response,
   // which was received at response_time.
   ValidationType RequiresValidation(const base::Time& request_time,
                                     const base::Time& response_time,
                                     const base::Time& current_time) const;
 
   // Calculates the amount of time the server claims the response is fresh from
   // the time the response was generated.  See section 13.2.4 of RFC 2616.  See
-  // RequiresValidation for a description of the response_time parameter.  Sets
-  // |FreshnessLifetimes.fresh| to the length of time the response may be used
-  // without revalidation, and |FreshnessLifetimes.stale| to the length of time
-  // the response may be used stale with asynchronous revalidation if
-  // stale-while-revalidate support is enabled.  See RFC 5861 section 3 for the
-  // definition of stale-while-revalidate.
+  // RequiresValidation for a description of the response_time parameter.  See
+  // the definition of FreshnessLifetimes above for the meaning of the return
+  // value.  See RFC 5861 section 3 for the definition of
+  // stale-while-revalidate.
   FreshnessLifetimes GetFreshnessLifetimes(
       const base::Time& response_time) const;
 
   // Returns the age of the response.  See section 13.2.3 of RFC 2616.
   // See RequiresValidation for a description of this method's parameters.
   base::TimeDelta GetCurrentAge(const base::Time& request_time,
                                 const base::Time& response_time,
                                 const base::Time& current_time) const;
 
   // The following methods extract values from the response headers.  If a
@@ skipping 163 matching lines @@
 
   // The parsed http version number (not normalized).
   HttpVersion parsed_http_version_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpResponseHeaders);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_RESPONSE_HEADERS_H_