Support Chromium-branded builds and cleanup reference build usage.

chrome/test/chrome_process_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/chrome_process_util.h"
 
 #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/test_switches.h"
 #include "content/common/result_codes.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 void TerminateAllChromeProcesses(base::ProcessId browser_pid) {
   ChromeProcessList process_pids(GetRunningChromeProcesses(browser_pid));
 
   ChromeProcessList::const_iterator it;
   for (it = process_pids.begin(); it != process_pids.end(); ++it) {
@@ skipping 20 matching lines @@
   virtual bool Includes(const base::ProcessEntry& entry) const {
     return parent_pids_.find(entry.parent_pid()) != parent_pids_.end();
   }
 
  private:
   const std::set<base::ProcessId> parent_pids_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessFilter);
 };
 
+const FilePath::CharType* GetRunningExecutableName() {
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding))
+    return chrome::kBrowserProcessExecutableNameChromium;
+  return chrome::kBrowserProcessExecutableName;
+}
+
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
+  const FilePath::CharType* executable_name = GetRunningExecutableName();
   ChromeProcessList result;
   if (browser_pid == static_cast<base::ProcessId>(-1))
     return result;
 
   ChildProcessFilter filter(browser_pid);
-  base::NamedProcessIterator it(chrome::kBrowserProcessExecutableName, &filter);
+  base::NamedProcessIterator it(executable_name, &filter);
   while (const base::ProcessEntry* process_entry = it.NextProcessEntry()) {
     result.push_back(process_entry->pid());
   }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // On Unix we might be running with a zygote process for the renderers.
   // Because of that we sweep the list of processes again and pick those which
   // are children of one of the processes that we've already seen.
   {
     ChildProcessFilter filter(result);
-    base::NamedProcessIterator it(chrome::kBrowserProcessExecutableName,
-                                  &filter);
+    base::NamedProcessIterator it(executable_name, &filter);
     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(chrome::kHelperProcessExecutableName,
-                                  &filter);
+    base::NamedProcessIterator it(executable_name, &filter);
     while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
       result.push_back(process_entry->pid());
   }
 #endif  // defined(OS_MACOSX)
 
   result.push_back(browser_pid);
 
   return result;
 }
 
@@ skipping 15 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;
 }