diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 22:39:38 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 22:39:38 +0000 |
commit | b0c53b28fa9624eba2d91904328899250022197f (patch) | |
tree | a58b7439e69ce18ccf6314d1e4a85487a0b12565 /chrome | |
parent | 8a64dfd7cccb65f8a5dcb2352c31b6829363e9d6 (diff) | |
download | chromium_src-b0c53b28fa9624eba2d91904328899250022197f.zip chromium_src-b0c53b28fa9624eba2d91904328899250022197f.tar.gz chromium_src-b0c53b28fa9624eba2d91904328899250022197f.tar.bz2 |
Revert "linux: use /proc/self/exe when exec'ing ourselves"
This reverts commit r32410. Stupid tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/common/child_process_host.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index 2e0f1f6..d4a9eda 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -93,20 +93,16 @@ FilePath ChildProcessHost::GetChildPath() { if (!child_path.empty()) return child_path; -#if defined(OS_LINUX) - // Use /proc/self/exe rather than our known binary path so updates - // can't swap out the binary from underneath us. - child_path = FilePath("/proc/self/exe"); -#elif defined(OS_MACOSX) +#if !defined(OS_MACOSX) + // On most platforms, the child executable is the same as the current + // executable. + PathService::Get(base::FILE_EXE, &child_path); +#else // On the Mac, the child executable lives at a predefined location within // the app bundle's versioned directory. child_path = chrome::GetVersionedDirectory(). Append(chrome::kHelperProcessExecutablePath); -#else - // On most platforms, the child executable is the same as the current - // executable. - PathService::Get(base::FILE_EXE, &child_path); -#endif +#endif // OS_MACOSX return child_path; } |