Add GetExpirationTimes() to HttpResponseHeader.

net/url_request/sdch_dictionary_fetcher.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 "net/url_request/sdch_dictionary_fetcher.h"
 
 #include <stdint.h>
 #include <queue>
 #include <set>
 
@@ skipping 149 matching lines @@
   DCHECK_EQ(request, current_request_.get());
   DCHECK_EQ(next_state_, STATE_SEND_REQUEST_PENDING);
   DCHECK(!in_loop_);
 
   // Confirm that the response isn't a stale read from the cache (as
   // may happen in the reload case).  If the response was not retrieved over
   // HTTP, it is presumed to be fresh.
   HttpResponseHeaders* response_headers = request->response_headers();
   int result = request->status().error();
   if (result == OK && response_headers) {
-    ValidationType validation_type = response_headers->RequiresValidation(
-        request->response_info().request_time,
-        request->response_info().response_time, base::Time::Now());
-    // TODO(rdsmith): Maybe handle VALIDATION_ASYNCHRONOUS by queueing
-    // a non-reload request for the dictionary.
-    if (validation_type != VALIDATION_NONE)
+    HttpResponseHeaders::ExpirationTimes expirations =
+        response_headers->GetExpirationTimes(
+            request->response_info().request_time,
+            request->response_info().response_time);
+    // TODO(rdsmith): Maybe handle stale resources by queueing a non-reload
+    // request for the dictionary.
+    if (base::Time::Now() >= expirations.GetFreshnessExpiry())
       result = ERR_FAILED;
   }
 
   DoLoop(result);
 }
 
 void SdchDictionaryFetcher::OnReadCompleted(URLRequest* request,
                                             int bytes_read) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(request, current_request_.get());
@@ skipping 186 matching lines @@
                           current_request_->net_log(),
                           current_request_->was_cached());
   }
 
   ResetRequest();
   next_state_ = STATE_SEND_REQUEST;
   return OK;
 }
 
 }  // namespace net