Http Cache: Small adjustment to the logic that determines the reuse status of an entry.

net/http/infinite_cache.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 "net/http/infinite_cache.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/bind.h"
@@ skipping 851 matching lines @@
     REUSE_ALWAYS_EXPIRED,
     REUSE_EXPIRED,
     REUSE_TRUNCATED,
     REUSE_VARY,
     REUSE_DUMMY_VALUE,
     // Not an individual value; it's added to another reason.
     REUSE_REVALIDATEABLE = 7
   };
   int reason = REUSE_OK;
 
-  if (old.flags & NO_CACHE)
-    reason = REUSE_NO_CACHE;
-
-  if (old.flags & EXPIRED)
-    reason = REUSE_ALWAYS_EXPIRED;
-
-  if (old.flags & TRUNCATED)
-    reason = REUSE_TRUNCATED;
-
   Time expiration = IntToTime(old.expiration);
   if (expiration < Time::Now())
     reason = REUSE_EXPIRED;
 
+  if (old.flags & EXPIRED)
+    reason = REUSE_ALWAYS_EXPIRED;
+
+  if (old.flags & NO_CACHE)
+    reason = REUSE_NO_CACHE;
+
+  if (old.flags & TRUNCATED)
+    reason = REUSE_TRUNCATED;
+
   if (old.vary_hash != current.vary_hash)
     reason = REUSE_VARY;
 
   bool have_to_drop  = (old.flags & TRUNCATED) && !(old.flags & RESUMABLE);
   if (reason && (old.flags & REVALIDATEABLE) && !have_to_drop)
     reason += REUSE_REVALIDATEABLE;
 
   UMA_HISTOGRAM_ENUMERATION("InfiniteCache.ReuseFailure", reason, 15);
   return !reason;
 }
@@ skipping 119 matching lines @@
 int InfiniteCache::FlushDataForTest(const CompletionCallback& callback) {
   DCHECK(worker_);
   int* result = new int;
   task_runner_->PostTaskAndReply(
       FROM_HERE, base::Bind(&InfiniteCache::Worker::Flush, worker_, result),
       base::Bind(&OnComplete, callback, base::Owned(result)));
   return net::ERR_IO_PENDING;
 }
 
 }  // namespace net