Give plug-in processes an executable heap and disable PIE/ASLR for Native

chrome/test/base/chrome_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 "chrome/test/base/chrome_process_util.h"
 
+#include <set>
+#include <string>
 #include <vector>
-#include <set>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/time.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/test_switches.h"
 #include "content/common/result_codes.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
@@ skipping 33 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ChildProcessFilter);
 };
 
 const FilePath::CharType* GetRunningBrowserExecutableName() {
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kEnableChromiumBranding))
     return chrome::kBrowserProcessExecutableNameChromium;
   return chrome::kBrowserProcessExecutableName;
 }
 
-const FilePath::CharType* GetRunningHelperExecutableName() {
+std::vector<FilePath::StringType> GetRunningHelperExecutableNames() {
+  FilePath::StringType name;
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding))
-    return chrome::kHelperProcessExecutableNameChromium;
-  return chrome::kHelperProcessExecutableName;
+  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding)) {
+    name = chrome::kHelperProcessExecutableNameChromium;
+  } else {
+    name = chrome::kHelperProcessExecutableName;
+  }
+
+  std::vector<FilePath::StringType> names;
+  names.push_back(name);
+
+#if defined(OS_MACOSX)
+  // The helper might show up as these different flavors depending on the
+  // executable flags required.
+  for (const char* const* suffix = chrome::kHelperFlavorSuffixes;
+       *suffix;
+       ++suffix) {
+    std::string flavor_name(name);
+    flavor_name.append(1, ' ');
+    flavor_name.append(*suffix);
+    names.push_back(flavor_name);
+  }
+#endif
+
+  return names;
 }
 
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
   const FilePath::CharType* executable_name = GetRunningBrowserExecutableName();
   ChromeProcessList result;
   if (browser_pid == static_cast<base::ProcessId>(-1))
     return result;
 
   ChildProcessFilter filter(browser_pid);
   base::NamedProcessIterator it(executable_name, &filter);
@@ skipping 11 matching lines @@
     while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
       result.push_back(process_entry->pid());
   }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_POSIX)
   // On Mac OS X we run the subprocesses with a different bundle, and
   // on Linux via /proc/self/exe, so they end up with a different
   // name.  We must collect them in a second pass.
   {
-    ChildProcessFilter filter(browser_pid);
-    base::NamedProcessIterator it(GetRunningHelperExecutableName(), &filter);
-    while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
-      result.push_back(process_entry->pid());
+    std::vector<FilePath::StringType> names = GetRunningHelperExecutableNames();
+    for (size_t i = 0; i < names.size(); ++i) {
+      FilePath::StringType name = names[i];
+      ChildProcessFilter filter(browser_pid);
+      base::NamedProcessIterator it(name, &filter);
+      while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
+        result.push_back(process_entry->pid());
+    }
   }
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_POSIX)
 
   result.push_back(browser_pid);
 
   return result;
 }
 
 #if !defined(OS_MACOSX)
 
 size_t ChromeTestProcessMetrics::GetPagefileUsage() {
   return process_metrics_->GetPagefileUsage();
@@ skipping 11 matching lines @@
     base::ProcessHandle process) {
 #if !defined(OS_MACOSX)
   process_metrics_.reset(
       base::ProcessMetrics::CreateProcessMetrics(process));
 #else
   process_metrics_.reset(
       base::ProcessMetrics::CreateProcessMetrics(process, NULL));
 #endif
   process_handle_ = process;
 }