Adding a simple class for dumping the contents of a cache. Use this new class in dump_cache.

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>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "net/disk_cache/disk_format.h"
+#include "net/tools/dump_cache/dump_files.h"
+#include "net/tools/dump_cache/simple_cache_dumper.h"
+
+#if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
-#include "net/disk_cache/disk_format.h"
+#include "net/tools/dump_cache/upgrade_win.h"
+#endif
 
 enum Errors {
   GENERIC = -1,
   ALL_GOOD = 0,
   INVALID_ARGUMENT = 1,
   FILE_ACCESS_ERROR,
   UNKNOWN_VERSION,
   TOOL_NOT_FOUND,
 };
 
-int GetMajorVersion(const FilePath& input_path);
-int DumpContents(const FilePath& input_path);
-int DumpHeaders(const FilePath& input_path);
-int RunSlave(const FilePath& input_path, const std::wstring& pipe_number);
-int CopyCache(const FilePath& output_path, HANDLE pipe, bool copy_to_text);
-HANDLE CreateServer(std::wstring* pipe_number);
-
 const char kUpgradeHelp[] =
     "\nIn order to use the upgrade function, a version of this tool that\n"
     "understands the file format of the files to upgrade is needed. For\n"
     "instance, to upgrade files saved with file format 3.4 to version 5.2,\n"
     "a version of this program that was compiled with version 3.4 has to be\n"
     "located beside this executable, and named dump_cache_3.exe, and this\n"
     "executable should be compiled with version 5.2 being the current one.";
 
 // Folders to read and write cache files.
 const char kInputPath[] = "input";
@@ skipping 18 matching lines @@
 int Help() {
   printf("warning: input files are modified by this tool\n");
   printf("dump_cache --input=path1 [--output=path2]\n");
   printf("--dump-headers: display file headers\n");
   printf("--dump-contents: display all entries\n");
   printf("--upgrade: copy contents to the output path\n");
   printf("--dump-to-files: write the contents of the cache to files\n");
   return INVALID_ARGUMENT;
 }
 
+#if defined(OS_WIN)
+
 // Starts a new process, to generate the files.
 int LaunchSlave(CommandLine command_line,
                 const std::wstring& pipe_number,
                 int version) {
   bool do_upgrade = command_line.HasSwitch(kUpgrade);
   bool do_convert_to_text = command_line.HasSwitch(kDumpToFiles);
 
   if (do_upgrade) {
     FilePath program(base::StringPrintf(L"%ls%d", L"dump_cache", version));
     command_line.SetProgram(program);
   }
 
   if (do_upgrade || do_convert_to_text)
     command_line.AppendSwitch(kSlave);
 
   command_line.AppendSwitchNative(kPipe, pipe_number);
   if (!base::LaunchProcess(command_line, base::LaunchOptions(), NULL)) {
     printf("Unable to launch the needed version of this tool: %ls\n",
            command_line.GetProgram().value().c_str());
     printf(kUpgradeHelp);
     return TOOL_NOT_FOUND;
   }
   return ALL_GOOD;
 }
 
+#endif
+
 // -----------------------------------------------------------------------
 
 int main(int argc, const char* argv[]) {
   // Setup an AtExitManager so Singleton objects will be destroyed.
   base::AtExitManager at_exit_manager;
 
   CommandLine::Init(argc, argv);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   FilePath input_path = command_line.GetSwitchValuePath(kInputPath);
   if (input_path.empty())
     return Help();
 
-  bool upgrade = false;
-  bool slave_required = false;
-  bool copy_to_text = false;
   FilePath output_path = command_line.GetSwitchValuePath(kOutputPath);
 
+  if (command_line.HasSwitch(kDumpToFiles)) {
+    net::SimpleCacheDumper dumper(input_path, output_path);
+    dumper.Run();
+    return 0;
+  }
+
+#if defined(OS_WIN)
+  bool upgrade = false;
   if (command_line.HasSwitch(kUpgrade))
     upgrade = true;
-  if (command_line.HasSwitch(kDumpToFiles))
-    copy_to_text = true;
 
-  if (upgrade || copy_to_text) {
+  bool slave_required = false;
+  if (upgrade) {
     if (output_path.empty())
       return Help();
     slave_required = true;
   }
 
   int version = GetMajorVersion(input_path);
   if (!version)
     return FILE_ACCESS_ERROR;
 
   if (version != disk_cache::kCurrentVersion >> 16) {
@@ skipping 14 matching lines @@
     if (!server.IsValid()) {
       printf("Unable to create the server pipe\n");
       return -1;
     }
 
     int ret = LaunchSlave(command_line, pipe_number, version);
     if (ret)
       return ret;
   }
 
-  if (upgrade || copy_to_text)
-    return CopyCache(output_path, server, copy_to_text);
+  // TODO(rch): Remove the logic from CopyCache that is redundant with
+  // SimpleCacheDumper.
+  if (upgrade)
+    return CopyCache(output_path, server, false);
 
   if (slave_required) {
     // Wait until the slave starts dumping data before we quit. Lazy "fix" for a
     // console quirk.
     Sleep(500);
     return ALL_GOOD;
   }
 
   if (command_line.HasSwitch(kDumpContents))
     return DumpContents(input_path);
   if (command_line.HasSwitch(kDumpHeaders))
     return DumpHeaders(input_path);
+#endif
   return Help();
 }