diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 18:28:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 18:28:15 +0000 |
| commit | da4216b5f0aaa247a24df6e1ac6aa3480cc037ff (patch) | |
| tree | 3a9ac18b7a945db92b3996c52d31c7e53814e126 | |
| parent | 24d6969c304316618d12bfbe49bc174101218eeb (diff) | |
| download | chromium_src-da4216b5f0aaa247a24df6e1ac6aa3480cc037ff.zip chromium_src-da4216b5f0aaa247a24df6e1ac6aa3480cc037ff.tar.gz chromium_src-da4216b5f0aaa247a24df6e1ac6aa3480cc037ff.tar.bz2 | |
Get rid of ChildProcessHost usage from chrome/common. The service process code didn't use any of the logic in ChildProcessHost to get the path of the current binary, so it can go directly to PathService.
BUG=98716
Review URL: http://codereview.chromium.org/8364029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106744 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/service_process_util.cc | 10 | ||||
| -rw-r--r-- | chrome/common/service_process_util_mac.mm | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc index de9d013..b10b98e 100644 --- a/chrome/common/service_process_util.cc +++ b/chrome/common/service_process_util.cc @@ -22,7 +22,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/service_process_util.h" -#include "content/common/child_process_host.h" +#include "content/common/content_paths.h" #if !defined(OS_MACOSX) @@ -252,11 +252,9 @@ IPC::ChannelHandle ServiceProcessState::GetServiceProcessChannel() { #endif // !OS_MACOSX void ServiceProcessState::CreateAutoRunCommandLine() { - FilePath exe_path = - ChildProcessHost::GetChildPath(ChildProcessHost::CHILD_NORMAL); - if (exe_path.empty()) { - NOTREACHED() << "Unable to get service process binary name."; - } + FilePath exe_path; + PathService::Get(content::CHILD_PROCESS_EXE, &exe_path); + DCHECK(!exe_path.empty()) << "Unable to get service process binary name."; autorun_command_line_.reset(new CommandLine(exe_path)); autorun_command_line_->AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess); diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm index 4a5a9b7..c92f6c0 100644 --- a/chrome/common/service_process_util_mac.mm +++ b/chrome/common/service_process_util_mac.mm @@ -27,7 +27,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/mac/launchd.h" -#include "content/common/child_process_host.h" using ::base::files::FilePathWatcher; |