CommandLine refactoring and cleanup.

chrome/browser/process_info_snapshot_mac.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/process_info_snapshot.h"
 
 #include <sys/sysctl.h>
 
 #include <sstream>
 
@@ skipping 109 matching lines @@
 
   return true;
 }
 
 // Capture the information by calling '/bin/ps'.
 // Note: we ignore the "tsiz" (text size) display option of ps because it's
 // always zero (tested on 10.5 and 10.6).
 static bool GetProcessMemoryInfoUsingPS(
     const std::vector<base::ProcessId>& pid_list,
     std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
-  const char kPsPathName[] = "/bin/ps";
-  std::vector<std::string> argv;
-  argv.push_back(kPsPathName);
+  const FilePath kProgram("/bin/ps");
+  CommandLine command_line(kProgram);
 
   // Get resident set size, virtual memory size.
-  argv.push_back("-o");
-  argv.push_back("pid=,rss=,vsz=");
+  command_line.AppendArg("-o");
+  command_line.AppendArg("pid=,rss=,vsz=");
   // Only display the specified PIDs.
   for (std::vector<base::ProcessId>::const_iterator it = pid_list.begin();
-      it != pid_list.end(); ++it) {
-    argv.push_back("-p");
-    argv.push_back(base::Int64ToString(static_cast<int64>(*it)));
+       it != pid_list.end(); ++it) {
+    command_line.AppendArg("-p");
+    command_line.AppendArg(base::Int64ToString(static_cast<int64>(*it)));
   }
 
   std::string output;
-  CommandLine command_line(argv);
   // Limit output read to a megabyte for safety.
   if (!base::GetAppOutputRestricted(command_line, &output, 1024 * 1024)) {
-    LOG(ERROR) << "Failure running " << kPsPathName << " to acquire data.";
+    LOG(ERROR) << "Failure running " << kProgram.value() << " to acquire data.";
     return false;
   }
 
   std::istringstream in(output, std::istringstream::in);
   std::string line;
 
   // Process lines until done.
   while (true) {
     // The format is as specified above to ps (see ps(1)):
     //   "-o pid=,rss=,vsz=".
     // Try to read the PID; if we get it, we should be able to get the rest of
     // the line.
     pid_t pid;
     in >> pid;
     if (in.eof())
       break;
 
     ProcessInfoSnapshot::ProcInfoEntry proc_info = proc_info_entries[pid];
     proc_info.pid = pid;
     in >> proc_info.rss;
     in >> proc_info.vsize;
     proc_info.rss *= 1024;                // Convert from kilobytes to bytes.
     proc_info.vsize *= 1024;
     in.ignore(1, ' ');                    // Eat the space.
     std::getline(in, proc_info.command);  // Get the rest of the line.
     if (!in.good()) {
-      LOG(ERROR) << "Error parsing output from " << kPsPathName << ".";
+      LOG(ERROR) << "Error parsing output from " << kProgram.value() << ".";
       return false;
     }
 
     if (!proc_info.pid || ! proc_info.vsize) {
-      LOG(WARNING) << "Invalid data from " << kPsPathName << ".";
+      LOG(WARNING) << "Invalid data from " << kProgram.value() << ".";
       return false;
     }
 
     // Record the process information.
     proc_info_entries[proc_info.pid] = proc_info;
   }
 
   return true;
 }
 
 static bool GetProcessMemoryInfoUsingTop(
     std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
-  const char kTopPathName[] = "/usr/bin/top";
-  std::vector<std::string> argv;
-  argv.push_back(kTopPathName);
+  const FilePath kProgram("/usr/bin/top");
+  CommandLine command_line(kProgram);
 
   // -stats tells top to print just the given fields as ordered.
-  argv.push_back("-stats");
-  argv.push_back("pid,"    // Process ID
-                 "rsize,"  // Resident memory
-                 "rshrd,"  // Resident shared memory
-                 "rprvt,"  // Resident private memory
-                 "vsize"); // Total virtual memory
+  command_line.AppendArg("-stats");
+  command_line.AppendArg("pid,"    // Process ID
+                         "rsize,"  // Resident memory
+                         "rshrd,"  // Resident shared memory
+                         "rprvt,"  // Resident private memory
+                         "vsize"); // Total virtual memory
   // Run top in logging (non-interactive) mode.
-  argv.push_back("-l");
-  argv.push_back("1");
+  command_line.AppendArg("-l");
+  command_line.AppendArg("1");
   // Set the delay between updates to 0.
-  argv.push_back("-s");
-  argv.push_back("0");
+  command_line.AppendArg("-s");
+  command_line.AppendArg("0");
 
   std::string output;
-  CommandLine command_line(argv);
   // Limit output read to a megabyte for safety.
   if (!base::GetAppOutputRestricted(command_line, &output, 1024 * 1024)) {
-    LOG(ERROR) << "Failure running " << kTopPathName << " to acquire data.";
+    LOG(ERROR) << "Failure running " << kProgram.value() << " to acquire data.";
     return false;
   }
 
   // Process lines until done. Lines should look something like this:
   // PID    RSIZE  RSHRD  RPRVT  VSIZE
   // 58539  1276K+ 336K+  740K+  2378M+
   // 58485  1888K+ 592K+  1332K+ 2383M+
   std::istringstream top_in(output, std::istringstream::in);
   std::string line;
   while (std::getline(top_in, line)) {
@@ skipping 41 matching lines @@
     proc_info.vsize = values[3];
     // Record the process information.
     proc_info_entries[proc_info.pid] = proc_info;
   }
 
   return true;
 }
 
 static bool GetProcessMemoryInfoUsingTop_10_5(
     std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
-  const char kTopPathName[] = "/usr/bin/top";
-  std::vector<std::string> argv;
-  argv.push_back(kTopPathName);
+  const FilePath kProgram("/usr/bin/top");
+  CommandLine command_line(kProgram);
 
   // -p tells top to print just the given fields as ordered.
-  argv.push_back("-p");
-  argv.push_back("^aaaaaaaaaaaaaaaaaaaa "  // Process ID (PID)
-                 "^jjjjjjjjjjjjjjjjjjjj "  // Resident memory (RSIZE)
-                 "^iiiiiiiiiiiiiiiiiiii "  // Resident shared memory (RSHRD)
-                 "^hhhhhhhhhhhhhhhhhhhh "  // Resident private memory (RPRVT)
-                 "^llllllllllllllllllll"); // Total virtual memory (VSIZE)
+  command_line.AppendArg("-p");
+  command_line.AppendArg(
+      "^aaaaaaaaaaaaaaaaaaaa "  // Process ID (PID)
+      "^jjjjjjjjjjjjjjjjjjjj "  // Resident memory (RSIZE)
+      "^iiiiiiiiiiiiiiiiiiii "  // Resident shared memory (RSHRD)
+      "^hhhhhhhhhhhhhhhhhhhh "  // Resident private memory (RPRVT)
+      "^llllllllllllllllllll"); // Total virtual memory (VSIZE)
   // Run top in logging (non-interactive) mode.
-  argv.push_back("-l");
-  argv.push_back("1");
+  command_line.AppendArg("-l");
+  command_line.AppendArg("1");
   // Set the delay between updates to 0.
-  argv.push_back("-s");
-  argv.push_back("0");
+  command_line.AppendArg("-s");
+  command_line.AppendArg("0");
 
   std::string output;
-  CommandLine command_line(argv);
   // Limit output read to a megabyte for safety.
   if (!base::GetAppOutputRestricted(command_line, &output, 1024 * 1024)) {
-    LOG(ERROR) << "Failure running " << kTopPathName << " to acquire data.";
+    LOG(ERROR) << "Failure running " << kProgram.value() << " to acquire data.";
     return false;
   }
 
   // Process lines until done. Lines should look something like this:
   // PID      RSIZE     RSHRD     RPRVT     VSIZE
   // 16943    815104    262144    290816    18489344
   // 16922    954368    720896    278528    18976768
   std::istringstream top_in(output, std::istringstream::in);
   std::string line;
   while (std::getline(top_in, line)) {
@@ skipping 146 matching lines @@
     ws_usage->shareable = 0;
     ws_usage->shared = 0;
     return false;
   }
 
   ws_usage->priv = proc_info.rprvt / 1024;
   ws_usage->shareable = proc_info.rss / 1024;
   ws_usage->shared = proc_info.rshrd / 1024;
   return true;
 }