Upstream misc changes for android.

base/process_util.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 "base/process_util.h"
 
 namespace base {
 
 #if defined(OS_POSIX)
 ProcessEntry::ProcessEntry() : pid_(0), ppid_(0), gid_(0) {}
@@ skipping 42 matching lines @@
 }
 
 bool ProcessIterator::IncludeEntry() {
   return !filter_ || filter_->Includes(entry_);
 }
 
 NamedProcessIterator::NamedProcessIterator(
     const FilePath::StringType& executable_name,
     const ProcessFilter* filter) : ProcessIterator(filter),
                                    executable_name_(executable_name) {
+#if defined(OS_ANDROID)
+  // On Android, the process name contains only the last 15 characters, which
+  // is in file /proc/<pid>/stat, the string between open parenthesis and close
+  // parenthesis. Please See ProcessIterator::CheckForNextProcess for details.
+  // Now if the length of input process name is greater than 15, only save the
+  // last 15 characters.
+  if (executable_name_.size() > 15)

[brettw, 2011/08/24 20:46:58]

Use {} for multiple-line conditionals.

[michaelbai, 2011/08/24 23:02:18]

Done.

+    executable_name_ = FilePath::StringType(executable_name_,
+                                            executable_name_.size() - 15, 15);
+#endif
 }
 
 NamedProcessIterator::~NamedProcessIterator() {
 }
 
 }  // namespace base