Adds memory cache logging, and updates disk cache logging

net/base/net_log_event_type_list.h

Index: net/base/net_log_event_type_list.h
===================================================================
--- net/base/net_log_event_type_list.h	(revision 76773)
+++ net/base/net_log_event_type_list.h	(working copy)
@@ -527,19 +527,21 @@
 EVENT_TYPE(HTTP_CACHE_WRITE_DATA)
 
 // ------------------------------------------------------------------------
-// Disk Cache
+// Disk Cache / Memory Cache
 // ------------------------------------------------------------------------
 
 // The creation/destruction of a disk_cache::EntryImpl object.  The "creation"
 // is considered to be the point at which an Entry is first considered to be
-// good and associated with a key.
+// good and associated with a key.  Note that disk and memory cache entries
+// share event types.
 //
 // For the BEGIN phase, the following parameters are attached:
 //   {
 //     "created": <true if the Entry was created, rather than being opened>;
 //     "key": <The Entry's key>;
 //   }
-EVENT_TYPE(DISK_CACHE_ENTRY)
+EVENT_TYPE(DISK_CACHE_ENTRY_IMPL)
+EVENT_TYPE(DISK_CACHE_MEM_ENTRY_IMPL)
 
 // Logs the time required to read/write data from/to a cache entry.
 //
@@ -549,7 +551,7 @@
 //     "offset": <Offset being read/written>;
 //     "buf_len": <Length of buffer being read to/written from>;
 //     "truncate": <If present for a write, the truncate flag is set to true.
-//                  Not present in reads or writes where it is false>
+//                  Not present in reads or writes where it is false>;
 //   }
 //
 // For the END phase, the following parameters are attached:
@@ -557,29 +559,57 @@
 //     "bytes_copied": <Number of bytes copied.  Not present on error>;
 //     "net_error": <Network error code.  Only present on error>;
 //   }
-EVENT_TYPE(DISK_CACHE_READ_DATA)
-EVENT_TYPE(DISK_CACHE_WRITE_DATA)
+EVENT_TYPE(ENTRY_READ_DATA)
+EVENT_TYPE(ENTRY_WRITE_DATA)
 
-// Logged when SparseControl starts/stops handling IO for an Entry.
-EVENT_TYPE(SPARSE_CONTROL)
+// Logged when sparse read/write operation starts/stops for an Entry.
+//
+// For the BEGIN phase, the following parameters are attached:
+//   {
+//     "offset": <Offset at which to start reading>;
+//     "buff_len": <Bytes to read/write>;
+//   }
+EVENT_TYPE(SPARSE_READ)
+EVENT_TYPE(SPARSE_WRITE)
 
-// Logged when SparseControl starts/stops reading/writing a child Entry's data
+// Logged when a parent Entry starts/stops reading/writing a child Entry's data.
 //
 // For the BEGIN phase, the following parameters are attached:
 //   {
-//     "source_dependency": <Source id of the child entry>
+//     "source_dependency": <Source id of the child entry>;
+//     "child_len": <Bytes to read/write from/to child>;
 //   }
-EVENT_TYPE(SPARSE_CONTROL_READ)
-EVENT_TYPE(SPARSE_CONTROL_WRITE)
+EVENT_TYPE(SPARSE_READ_CHILD_DATA)
+EVENT_TYPE(SPARSE_WRITE_CHILD_DATA)
 
-// Indicates the time taken by a sparse control to get a range.
-EVENT_TYPE(SPARSE_CONTROL_GET_RANGE)
+// Logged when sparse GetAvailableRange operation starts/stops for an Entry.
+//
+// For the BEGIN phase, the following parameters are attached:
+//   {
+//     "buff_len": <Bytes to read/write>;
+//     "offset": <Offset at which to start reading>;
+//   }
+//
+// For the END phase, the following parameters are attached.  No parameters are
+// attached when cancelled:
+//   {
+//     "length": <Length of returned range. Only present on success>;
+//     "start": <Position where returned range starts. Only present on success>;
+//     "net_error": <Resulting error code. Only present on failure. This may be
+//                   "OK" when there's no error, but no available bytes in the
+//                   range>;
+//   }
+EVENT_TYPE(SPARSE_GET_RANGE)
 
-// Logged when an entry is closed.
-EVENT_TYPE(DISK_CACHE_CLOSE)
+// Indicates the children of a sparse EntryImpl are about to be deleted.
+// Not logged for MemEntryImpls.
+EVENT_TYPE(SPARSE_DELETE_CHILDREN)
 
+// Logged when an EntryImpl is closed.  Not logged for MemEntryImpls.
+EVENT_TYPE(ENTRY_CLOSE)
+
 // Logged when an entry is doomed.
-EVENT_TYPE(DISK_CACHE_DOOM)
+EVENT_TYPE(ENTRY_DOOM)
 
 // ------------------------------------------------------------------------
 // HttpStreamFactoryImpl