| Index: chrome/test/base/chrome_process_util.cc
|
| diff --git a/chrome/test/base/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc
|
| index 201b6802e4a64bd19115d5d957b8c2cbe15cc87d..8466ec39984a92ddd435df95d3ec97a4e05ba041 100644
|
| --- a/chrome/test/base/chrome_process_util.cc
|
| +++ b/chrome/test/base/chrome_process_util.cc
|
| @@ -19,35 +19,6 @@
|
| using base::TimeDelta;
|
| using base::TimeTicks;
|
|
|
| -namespace {
|
| -
|
| -#if defined(OS_POSIX)
|
| -// Returns the executable name of the current Chrome helper process.
|
| -std::vector<base::FilePath::StringType> GetRunningHelperExecutableNames() {
|
| - base::FilePath::StringType name = chrome::kHelperProcessExecutableName;
|
| -
|
| - std::vector<base::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;
|
| -}
|
| -#endif // defined(OS_POSIX)
|
| -
|
| -} // namespace
|
| -
|
| void TerminateAllChromeProcesses(const ChromeProcessList& process_pids) {
|
| ChromeProcessList::const_iterator it;
|
| for (it = process_pids.begin(); it != process_pids.end(); ++it) {
|
| @@ -108,15 +79,11 @@ ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
|
| // on Linux via /proc/self/exe, so they end up with a different
|
| // name. We must collect them in a second pass.
|
| {
|
| - std::vector<base::FilePath::StringType> names =
|
| - GetRunningHelperExecutableNames();
|
| - for (size_t i = 0; i < names.size(); ++i) {
|
| - base::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());
|
| - }
|
| + base::FilePath::StringType name = chrome::kHelperProcessExecutableName;
|
| + 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_POSIX)
|
|
|
|
|