mac: Disable parts of ProcessInfoSnapshotMacTest on OSX 10.9+.

chrome/browser/process_info_snapshot_mac.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.
 
 #include "chrome/browser/process_info_snapshot.h"
 
 #include <sys/sysctl.h>
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 
 // Default constructor.
 ProcessInfoSnapshot::ProcessInfoSnapshot() { }
 
 // Destructor: just call |Reset()| to release everything.
 ProcessInfoSnapshot::~ProcessInfoSnapshot() {
@@ skipping 136 matching lines @@
     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()) {
+
+    // If the fail or bad bits were set, then there was an error reading input.
+    if (in.fail()) {
       LOG(ERROR) << "Error parsing output from " << kProgram.value() << ".";
       return false;
     }
 
     if (!proc_info.pid || ! proc_info.vsize) {
       LOG(WARNING) << "Invalid data from " << kProgram.value() << ".";
       return false;
     }
 
     // Record the process information.
     proc_info_entries[proc_info.pid] = proc_info;
+
+    // Ignore the rest of the line.
+    in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
   }
 
   return true;
 }
 
 static bool GetProcessMemoryInfoUsingTop(
     std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
   const base::FilePath kProgram("/usr/bin/top");
   CommandLine command_line(kProgram);
 
@@ skipping 108 matching lines @@
   // process doesn't have privileges to inspect the target process.
   for (std::vector<base::ProcessId>::iterator it = pid_list.begin();
        it != pid_list.end(); ++it) {
     std::string exectuable_name;
     if (GetExecutableNameForProcessID(*it, &exectuable_name)) {
       ProcInfoEntry proc_info = proc_info_entries_[*it];
       proc_info.command = exectuable_name;
     }
   }
 
+  // In OSX 10.9+, top no longer returns any useful information. 'rshrd' is no
+  // longer supported, and 'rprvt' and 'vsize' return N/A. 'rsize' still works,
+  // but the information is also available from ps.
+  // http://crbug.com/383553
+  if (base::mac::IsOSMavericksOrLater())
+    return GetProcessMemoryInfoUsingPS(pid_list, proc_info_entries_);
+
   // Get memory information using top.
   bool memory_info_success = GetProcessMemoryInfoUsingTop(proc_info_entries_);
 
   // If top didn't work then fall back to ps.
   if (!memory_info_success) {
     memory_info_success = GetProcessMemoryInfoUsingPS(pid_list,
                                                       proc_info_entries_);
   }
 
   return memory_info_success;
@@ skipping 65 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;
 }