Disk cache v3 ref2

net/tools/dump_cache/dump_cache.cc

 // Copyright (c) 2012 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.
 
 // This command-line program dumps the contents of a set of cache files, either
 // to stdout or to another set of cache files.
 
 #include <stdio.h>
 #include <string>
 
@@ skipping 111 matching lines @@
 
   base::FilePath output_path = command_line.GetSwitchValuePath(kOutputPath);
   if ((dump_to_files || upgrade) && output_path.empty())
     return Help();
 
   int version = GetMajorVersion(input_path);
   if (!version)
     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;
     }
     slave_required = true;
   }
 
 #if defined(OS_WIN)
   base::string16 pipe_number = command_line.GetSwitchValueNative(kPipe);
   if (command_line.HasSwitch(kSlave) && slave_required)
@@ skipping 27 matching lines @@
     return INVALID_ARGUMENT;
   }
 #endif
 
   if (dump_to_files) {
     net::SimpleCacheDumper dumper(input_path, output_path);
     dumper.Run();
     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);
 
   return Help();
 }