Update references to the now-gone LaunchApp() from the code.
BUG=88990
Review URL: http://codereview.chromium.org/7423003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93035 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/process_util.h b/base/process_util.h
index e55b6109..2179b61 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -194,7 +194,7 @@
typedef std::vector<std::pair<std::string, std::string> > environment_vector;
typedef std::vector<std::pair<int, int> > file_handle_mapping_vector;
-// Options for launching a subprocess that are passed to LaunchApp().
+// Options for launching a subprocess that are passed to LaunchProcess().
// The default constructor constructs the object with default options.
struct LaunchOptions {
LaunchOptions() : wait(false),
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 3bc4d97..db380bd 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -628,7 +628,7 @@
argv_cstr[i] = const_cast<char*>(argv[i].c_str());
argv_cstr[argv.size()] = NULL;
execvp(argv_cstr[0], argv_cstr.get());
- RAW_LOG(ERROR, "LaunchApp: failed to execvp:");
+ RAW_LOG(ERROR, "LaunchProcess: failed to execvp:");
RAW_LOG(ERROR, argv_cstr[0]);
_exit(127);
} else {
diff --git a/chrome/browser/browser_main_posix.cc b/chrome/browser/browser_main_posix.cc
index 42dde452..cd88cc7 100644
--- a/chrome/browser/browser_main_posix.cc
+++ b/chrome/browser/browser_main_posix.cc
@@ -196,7 +196,7 @@
// If adding to this list of signal handlers, note the new signal probably
// needs to be reset in child processes. See
- // base/process_util_posix.cc:LaunchApp
+ // base/process_util_posix.cc:LaunchProcess.
// We need to handle SIGTERM, because that is how many POSIX-based distros ask
// processes to quit gracefully at shutdown time.
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc
index 60b44e43..a004255 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard.cc
@@ -302,7 +302,7 @@
VLOG(1) << "OnSetLayoutFinish: pid=" << pid;
if (self->execute_queue_.empty()) {
LOG(ERROR) << "OnSetLayoutFinish: execute_queue_ is empty. "
- << "base::LaunchApp failed? pid=" << pid;
+ << "base::LaunchProcess failed? pid=" << pid;
return;
}
self->execute_queue_.pop();
diff --git a/chrome/browser/mac/relauncher.cc b/chrome/browser/mac/relauncher.cc
index fdbad512..14abba2 100644
--- a/chrome/browser/mac/relauncher.cc
+++ b/chrome/browser/mac/relauncher.cc
@@ -142,7 +142,7 @@
file_util::ScopedFD pipe_read_fd(&pipe_fds[0]);
file_util::ScopedFD pipe_write_fd(&pipe_fds[1]);
- // Make sure kRelauncherSyncFD is a safe value. base::LaunchApp will
+ // Make sure kRelauncherSyncFD is a safe value. base::LaunchProcess will
// preserve these three FDs in forked processes, so kRelauncherSyncFD should
// not conflict with them.
COMPILE_ASSERT(kRelauncherSyncFD != STDIN_FILENO &&
diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc
index 2f26747..ec7d492 100644
--- a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc
@@ -47,12 +47,14 @@
// Start the given proxy configuration utility.
bool StartProxyConfigUtil(TabContents* tab_contents, const char* command[]) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- // base::LaunchApp() returns true ("success") if the fork() succeeds, but not
- // necessarily the exec(). We'd like to be able to use StartProxyConfigUtil()
- // to search possible options and stop on success, so we search $PATH first to
- // predict whether the exec is expected to succeed.
- // TODO(mdm): this is a useful check, and is very similar to some code in
- // proxy_config_service_linux.cc. It should probably be in base:: somewhere.
+ // base::LaunchProcess() returns true ("success") if the fork()
+ // succeeds, but not necessarily the exec(). We'd like to be able to
+ // use StartProxyConfigUtil() to search possible options and stop on
+ // success, so we search $PATH first to predict whether the exec is
+ // expected to succeed.
+ // TODO(mdm): this is a useful check, and is very similar to some
+ // code in proxy_config_service_linux.cc. It should probably be in
+ // base:: somewhere.
scoped_ptr<base::Environment> env(base::Environment::Create());
std::string path;
if (!env->GetVar("PATH", &path)) {