diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 03:17:02 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 03:17:02 +0000 |
commit | bf84c589154a261c540ba514a0cbf600d77e3c9f (patch) | |
tree | f42157e456d3ad08eda83340ed3545634ede05c0 /content/browser/browser_child_process_host.cc | |
parent | 09ba32619bab580cf09824850a3c86b10689894c (diff) | |
download | chromium_src-bf84c589154a261c540ba514a0cbf600d77e3c9f.zip chromium_src-bf84c589154a261c540ba514a0cbf600d77e3c9f.tar.gz chromium_src-bf84c589154a261c540ba514a0cbf600d77e3c9f.tar.bz2 |
This patch caused Chrome to be unable to load any web pages on Chrome OS.
BUG=chromium-os:19468
TEST=confirm chrome loads pages
Revert "Fix IPC OnChannelConnected() to send correct PID on Linux/CrOS"
This reverts commit 92321e01ba42f2d0e9508e921f8b440ac0b5319f.
Review URL: http://codereview.chromium.org/7712022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_child_process_host.cc')
-rw-r--r-- | content/browser/browser_child_process_host.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index 97e1220..40b6598 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -83,10 +83,6 @@ void BrowserChildProcessHost::Launch( content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( cmd_line, id()); -#if defined(OS_LINUX) - channel()->SetNeedsOverridePeerPid(); -#endif - child_process_.reset(new ChildProcessLauncher( #if defined(OS_WIN) exposed_dir, @@ -171,16 +167,11 @@ BrowserChildProcessHost::ClientHook::ClientHook(BrowserChildProcessHost* host) } void BrowserChildProcessHost::ClientHook::OnProcessLaunched() { - base::ProcessHandle child_handle = host_->child_process_->GetHandle(); - if (!child_handle) { + if (!host_->child_process_->GetHandle()) { host_->OnChildDied(); return; } - host_->set_handle(child_handle); -#if defined(OS_LINUX) - int32 child_pid = base::GetProcId(child_handle); - host_->channel()->OverridePeerPid(child_pid); -#endif + host_->set_handle(host_->child_process_->GetHandle()); host_->OnProcessLaunched(); } |