SimpleCache: merge the first and second stream in one file

net/disk_cache/simple/simple_index_file.cc

Index: net/disk_cache/simple/simple_index_file.cc
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc
index 61318c83b933718c8d760332868d161b74fcd2bc..8d4e3ff36f145d7625cf0ca7fd6ec1e993c2454f 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -412,7 +412,7 @@ void SimpleIndexFile::SyncRestoreFromDisk(
   SimpleIndex::EntrySet* entries = &out_result->entries;
 
   // TODO(felipeg,gavinp): Fix this once we have a one-file per entry format.
-  COMPILE_ASSERT(kSimpleEntryFileCount == 3,
+  COMPILE_ASSERT(kSimpleEntryFileCount == 2,

[pasko, 2013/09/17 14:17:36]

Please remove the assertion and the TODO. The assertion does not make sense
(there is no "format" for file entries any more, we just go through all files
that start with something looking like a key, with a length of filename equal to
exact number). The TODO will never get done, obviously. Also I like how the word
"Fix" is entertaining in the context.

[clamy, 2013/09/18 16:17:14]

Done.

                  file_pattern_must_match_file_count);
 
   const bool did_succeed = TraverseCacheDirectory(