summaryrefslogtreecommitdiffstats
path: root/chrome/browser/utility_process_host.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:51:02 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:51:02 +0000
commit961306dca553f6e7b5262e384317a73351a77985 (patch)
treedbba7e1e9d1774eaf03c5254bbeb71a42c914fda /chrome/browser/utility_process_host.cc
parentd04d10a3b93b428d5e4fe636be4ab6ffd94424d9 (diff)
downloadchromium_src-961306dca553f6e7b5262e384317a73351a77985.zip
chromium_src-961306dca553f6e7b5262e384317a73351a77985.tar.gz
chromium_src-961306dca553f6e7b5262e384317a73351a77985.tar.bz2
Back out r22981, it may have caused Windows test failures.
Review URL: http://codereview.chromium.org/164298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/utility_process_host.cc')
-rw-r--r--chrome/browser/utility_process_host.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index c06749d..149d296 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -52,7 +52,12 @@ bool UtilityProcessHost::StartWebResourceUnpacker(const std::string& data) {
}
std::wstring UtilityProcessHost::GetUtilityProcessCmd() {
- return GetChildPath();
+ std::wstring exe_path = CommandLine::ForCurrentProcess()->GetSwitchValue(
+ switches::kBrowserSubprocessPath);
+ if (exe_path.empty()) {
+ PathService::Get(base::FILE_EXE, &exe_path);
+ }
+ return exe_path;
}
bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {