Http cache: Make sure we separate the infinite cache simulation from the real cache.

net/http/infinite_cache.cc

Index: net/http/infinite_cache.cc
===================================================================
--- net/http/infinite_cache.cc	(revision 157450)
+++ net/http/infinite_cache.cc	(working copy)
@@ -314,11 +314,14 @@
   resource_data_->details.flags |= TRUNCATED;
 }
 
-void InfiniteCacheTransaction::OnServedFromCache() {
+void InfiniteCacheTransaction::OnServedFromCache(
+    const HttpResponseInfo* response) {
   if (!cache_)
     return;
 
   resource_data_->details.flags |= CACHED;
+  if (!resource_data_->details.last_access)
+    OnResponseReceived(response);
 }
 
 void InfiniteCacheTransaction::Finish() {
@@ -503,25 +506,21 @@
     }
     data->details.use_count = i->second.use_count;
     data->details.update_count = i->second.update_count;
-    if (data->details.flags & CACHED) {
-      RecordHit(i->second, &data->details);
-    } else {
-      bool reused = CanReuse(i->second, data->details);
-      bool data_changed = DataChanged(i->second, data->details);
-      bool headers_changed = HeadersChanged(i->second, data->details);
+    bool reused = CanReuse(i->second, data->details);
+    bool data_changed = DataChanged(i->second, data->details);
+    bool headers_changed = HeadersChanged(i->second, data->details);
 
-      if (reused && data_changed)
-        header_->num_bad_hits++;
+    if (reused && data_changed)
+      header_->num_bad_hits++;
 
-      if (reused)
-        RecordHit(i->second, &data->details);
+    if (reused)
+      RecordHit(i->second, &data->details);
 
-      if (headers_changed)
-        UMA_HISTOGRAM_BOOLEAN("InfiniteCache.HeadersChange", true);
+    if (headers_changed)
+      UMA_HISTOGRAM_BOOLEAN("InfiniteCache.HeadersChange", true);
 
-      if (data_changed)
-        RecordUpdate(i->second, &data->details);
-    }
+    if (data_changed)
+      RecordUpdate(i->second, &data->details);
 
     if (data->details.flags & NO_STORE) {
       Remove(i->second);
@@ -896,6 +895,9 @@
 
 bool InfiniteCache::Worker::DataChanged(const Details& old,
                                         const Details& current) {
+  if (current.flags & CACHED)
+    return false;
+
   bool changed = false;
   if (old.response_size != current.response_size) {
     changed = true;