Adds memory cache logging, and updates disk cache logging

chrome/browser/net/passive_log_collector.cc

 // Copyright (c) 2010 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/passive_log_collector.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
@@ skipping 53 matching lines @@
   trackers_[net::NetLog::SOURCE_SOCKET_STREAM] = &socket_stream_tracker_;
   trackers_[net::NetLog::SOURCE_CONNECT_JOB] = &connect_job_tracker_;
   trackers_[net::NetLog::SOURCE_SOCKET] = &socket_tracker_;
   trackers_[net::NetLog::SOURCE_INIT_PROXY_RESOLVER] =
       &init_proxy_resolver_tracker_;
   trackers_[net::NetLog::SOURCE_SPDY_SESSION] = &spdy_session_tracker_;
   trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_REQUEST] =
       &dns_request_tracker_;
   trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_JOB] = &dns_job_tracker_;
   trackers_[net::NetLog::SOURCE_DISK_CACHE_ENTRY] = &disk_cache_entry_tracker_;
+  trackers_[net::NetLog::SOURCE_MEMORY_CACHE_ENTRY] = &mem_cache_entry_tracker_;
   trackers_[net::NetLog::SOURCE_HTTP_STREAM_JOB] = &http_stream_job_tracker_;
   // Make sure our mapping is up-to-date.
   for (size_t i = 0; i < arraysize(trackers_); ++i)
     DCHECK(trackers_[i]) << "Unhandled SourceType: " << i;
 }
 
 PassiveLogCollector::~PassiveLogCollector() {
 }
 
 void PassiveLogCollector::OnAddEntry(
@@ skipping 487 matching lines @@
 PassiveLogCollector::DiskCacheEntryTracker::DiskCacheEntryTracker()
     : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
 }
 
 PassiveLogCollector::SourceTracker::Action
 PassiveLogCollector::DiskCacheEntryTracker::DoAddEntry(
     const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
   AddEntryToSourceInfo(entry, out_info);
 
   // If the request has ended, move it to the graveyard.
-  if (entry.type == net::NetLog::TYPE_DISK_CACHE_ENTRY &&
+  if (entry.type == net::NetLog::TYPE_DISK_CACHE_ENTRY_IMPL &&
       entry.phase == net::NetLog::PHASE_END) {
     return ACTION_MOVE_TO_GRAVEYARD;
   }
 
   return ACTION_NONE;
 }
 
 //----------------------------------------------------------------------------
+// MemCacheEntryTracker
+//----------------------------------------------------------------------------
+
+const size_t PassiveLogCollector::MemCacheEntryTracker::kMaxNumSources = 100;
+const size_t PassiveLogCollector::MemCacheEntryTracker::kMaxGraveyardSize = 25;
+
+PassiveLogCollector::MemCacheEntryTracker::MemCacheEntryTracker()
+    : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
+}
+
+PassiveLogCollector::SourceTracker::Action
+PassiveLogCollector::MemCacheEntryTracker::DoAddEntry(
+    const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
+  AddEntryToSourceInfo(entry, out_info);
+
+  // If the request has ended, move it to the graveyard.
+  if (entry.type == net::NetLog::TYPE_DISK_CACHE_MEM_ENTRY_IMPL &&
+      entry.phase == net::NetLog::PHASE_END) {
+    return ACTION_MOVE_TO_GRAVEYARD;
+  }
+
+  return ACTION_NONE;
+}
+
+//----------------------------------------------------------------------------
 // HttpStreamJobTracker
 //----------------------------------------------------------------------------
 
 const size_t PassiveLogCollector::HttpStreamJobTracker::kMaxNumSources = 100;
 const size_t PassiveLogCollector::HttpStreamJobTracker::kMaxGraveyardSize = 25;
 
 PassiveLogCollector::HttpStreamJobTracker::HttpStreamJobTracker(
     PassiveLogCollector* parent)
     : SourceTracker(kMaxNumSources, kMaxGraveyardSize, parent) {
 }
@@ skipping 11 matching lines @@
   AddEntryToSourceInfo(entry, out_info);
 
   // If the request has ended, move it to the graveyard.
   if (entry.type == net::NetLog::TYPE_HTTP_STREAM_JOB &&
       entry.phase == net::NetLog::PHASE_END) {
     return ACTION_MOVE_TO_GRAVEYARD;
   }
 
   return ACTION_NONE;
 }