Remove disk_cache::BackendImpl::OpenPrevEntry() and all users.

net/tools/dump_cache/dump_cache.cc

Index: net/tools/dump_cache/dump_cache.cc
diff --git a/net/tools/dump_cache/dump_cache.cc b/net/tools/dump_cache/dump_cache.cc
index b3970e6053f0f7f64a560acc807bbf3fabea90c1..96d47d0bdcddf26a6cab00572b0536e2b6cbccd5 100644
--- a/net/tools/dump_cache/dump_cache.cc
+++ b/net/tools/dump_cache/dump_cache.cc
@@ -17,12 +17,6 @@
 #include "net/tools/dump_cache/dump_files.h"
 #include "net/tools/dump_cache/simple_cache_dumper.h"
 
-#if defined(OS_WIN)
-#include "base/process/launch.h"
-#include "base/win/scoped_handle.h"
-#include "net/tools/dump_cache/upgrade_win.h"
-#endif
-
 enum Errors {
   GENERIC = -1,
   ALL_GOOD = 0,
@@ -32,16 +26,6 @@ enum Errors {
   TOOL_NOT_FOUND,
 };
 
-#if defined(OS_WIN)
-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.";
-#endif  // defined(OS_WIN)
-
 // Folders to read and write cache files.
 const char kInputPath[] = "input";
 const char kOutputPath[] = "output";
@@ -55,55 +39,15 @@ const char kDumpContents[] = "dump-contents";
 // Convert the cache to files.
 const char kDumpToFiles[] = "dump-to-files";
 
-// Upgrade an old version to the current one.
-const char kUpgrade[] = "upgrade";
-
-// Internal use:
-const char kSlave[] = "slave";
-#if defined(OS_WIN)
-const char kPipe[] = "pipe";
-#endif  // defined(OS_WIN)
-
 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 base::string16& pipe_number,
-                int version) {
-  bool do_upgrade = command_line.HasSwitch(kUpgrade);
-  bool do_convert_to_text = command_line.HasSwitch(kDumpToFiles);
-
-  if (do_upgrade) {
-    base::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("%s", kUpgradeHelp);
-    return TOOL_NOT_FOUND;
-  }
-  return ALL_GOOD;
-}
-
-#endif
-
 // -----------------------------------------------------------------------
 
 int main(int argc, const char* argv[]) {
@@ -119,59 +63,15 @@ int main(int argc, const char* argv[]) {
     return Help();
 
   bool dump_to_files = command_line.HasSwitch(kDumpToFiles);
-  bool upgrade = command_line.HasSwitch(kUpgrade);
 
   base::FilePath output_path = command_line.GetSwitchValuePath(kOutputPath);
-  if ((dump_to_files || upgrade) && output_path.empty())
+  if (dump_to_files && 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 (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)
-    return RunSlave(input_path, pipe_number);
-
-  base::win::ScopedHandle server;
-  if (slave_required) {
-    server.Set(CreateServer(&pipe_number));
-    if (!server.IsValid()) {
-      printf("Unable to create the server pipe\n");
-      return GENERIC;
-    }
-
-    int ret = LaunchSlave(command_line, pipe_number, version);
-    if (ret)
-      return ret;
-  }
-
-  if (upgrade)
-    return UpgradeCache(output_path, server);
-
-  if (slave_required) {
-    // Wait until the slave starts dumping data before we quit. Lazy "fix" for a
-    // console quirk.
-    Sleep(500);
-    return ALL_GOOD;
-  }
-#else  // defined(OS_WIN)
-  if (slave_required) {
-    printf("Unsupported operation\n");
-    return INVALID_ARGUMENT;
-  }
-#endif
-
   if (dump_to_files) {
     net::SimpleCacheDumper dumper(input_path, output_path);
     dumper.Run();