Disk cache v3 ref2

net/tools/dump_cache/dump_cache.cc

Index: net/tools/dump_cache/dump_cache.cc
===================================================================
--- net/tools/dump_cache/dump_cache.cc	(revision 232523)
+++ net/tools/dump_cache/dump_cache.cc	(working copy)
@@ -129,7 +129,7 @@
     return FILE_ACCESS_ERROR;
 
   bool slave_required = upgrade;
-  if (version != disk_cache::kCurrentVersion >> 16) {
+  if ((version != 2) && (version != 3)) {
     if (command_line.HasSwitch(kSlave)) {
       printf("Unknown version\n");
       return UNKNOWN_VERSION;
@@ -177,8 +177,12 @@
     return ALL_GOOD;
   }
 
-  if (command_line.HasSwitch(kDumpContents))
-    return DumpContents(input_path);
+  if (command_line.HasSwitch(kDumpContents)) {
+    if (version == 3)
+      return DumpContentsV3(input_path);
+    else
+      return DumpContentsV2(input_path);
+  }
 
   if (command_line.HasSwitch(kDumpHeaders))
     return DumpHeaders(input_path);