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..488d645c34f6aabf2dcac3041508470cc6103dee 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -117,7 +117,7 @@ void ProcessEntryFile(SimpleIndex::EntrySet* entries,
         EntryMetadata(last_used_time, file_size),
         entries);
   } else {
-    // Summing up the total size of the entry through all the *_[0-2] files
+    // Summing up the total size of the entry through all the *_[0-1] files
     it->second.SetEntrySize(it->second.GetEntrySize() + file_size);
   }
 }
@@ -411,10 +411,6 @@ void SimpleIndexFile::SyncRestoreFromDisk(
   out_result->Reset();
   SimpleIndex::EntrySet* entries = &out_result->entries;
 
-  // TODO(felipeg,gavinp): Fix this once we have a one-file per entry format.
-  COMPILE_ASSERT(kSimpleEntryFileCount == 3,
-                 file_pattern_must_match_file_count);
-
   const bool did_succeed = TraverseCacheDirectory(
       cache_directory, base::Bind(&ProcessEntryFile, entries));
   if (!did_succeed) {