Rename CommandLine::GetCommandLineString().

net/tools/dump_cache/dump_cache.cc

 // Copyright (c) 2011 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 53 matching lines @@
   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;
 }
 
 // Starts a new process, to generate the files.
-int LaunchSlave(const CommandLine& command_line,
-                const std::wstring& pipe_number, int version) {
-  // TODO(port): remove this string-munging hackery.
-  std::wstring hacked_command_line = command_line.command_line_string();
-  const std::wstring old_exe(L"dump_cache");
-  size_t to_remove = hacked_command_line.find(old_exe);
-  hacked_command_line.erase(to_remove, old_exe.size());
-
+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);
 
-  std::wstring new_program;
-  if (do_upgrade)
-    new_program = base::StringPrintf(L"%ls%d", L"dump_cache_", version);
-  else
-    new_program = base::StringPrintf(L"dump_cache");
-
-  hacked_command_line.insert(to_remove, new_program);
-
-  CommandLine new_command_line = CommandLine::FromString(hacked_command_line);
+  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)
-    new_command_line.AppendSwitch(kSlave);
+    command_line.AppendSwitch(kSlave);
 
   // TODO(evanm): remove needless usage of wstring from here and elsewhere.
-  new_command_line.AppendSwitchASCII(kPipe, WideToASCII(pipe_number));
-  if (!base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL)) {
+  command_line.AppendSwitchASCII(kPipe, WideToASCII(pipe_number));
+  if (!base::LaunchProcess(command_line, base::LaunchOptions(), NULL)) {
     printf("Unable to launch the needed version of this tool: %ls\n",
-           new_program.c_str());
+           command_line.GetProgram().value().c_str());
     printf(kUpgradeHelp);
     return TOOL_NOT_FOUND;
   }
   return ALL_GOOD;
 }
 
 // -----------------------------------------------------------------------
 
 int main(int argc, const char* argv[]) {
   // Setup an AtExitManager so Singleton objects will be destroyed.
@@ skipping 64 matching lines @@
     Sleep(500);
     return ALL_GOOD;
   }
 
   if (command_line.HasSwitch(kDumpContents))
     return DumpContents(input_path);
   if (command_line.HasSwitch(kDumpHeaders))
     return DumpHeaders(input_path);
   return Help();
 }