Removed un-used commandline switches.

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 "base/command_line.h"
 #include "base/process/kill.h"
 #include "base/process/process_iterator.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/test_switches.h"
 #include "content/public/common/result_codes.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace {
 
-// Returns the executable name of the current Chrome browser process.
-const base::FilePath::CharType* GetRunningBrowserExecutableName() {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding))
-    return chrome::kBrowserProcessExecutableNameChromium;
-  return chrome::kBrowserProcessExecutableName;
-}
-
 // Returns the executable name of the current Chrome helper process.
 std::vector<base::FilePath::StringType> GetRunningHelperExecutableNames() {
-  base::FilePath::StringType name;
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding)) {
-    name = chrome::kHelperProcessExecutableNameChromium;
-  } else {
-    name = chrome::kHelperProcessExecutableName;
-  }
+  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) {
@@ skipping 37 matching lines @@
   }
 
  private:
   const std::set<base::ProcessId> parent_pids_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessFilter);
 };
 
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
   const base::FilePath::CharType* executable_name =
-      GetRunningBrowserExecutableName();
+      chrome::kBrowserProcessExecutableName;
   ChromeProcessList result;
   if (browser_pid == static_cast<base::ProcessId>(-1))
     return result;
 
   ChildProcessFilter filter(browser_pid);
   base::NamedProcessIterator it(executable_name, &filter);
   while (const base::ProcessEntry* process_entry = it.NextProcessEntry()) {
     result.push_back(process_entry->pid());
   }
 
@@ skipping 49 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;
 }