Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2029)

Unified Diff: content/browser/browser_child_process_host.cc

Issue 7712022: This patch caused Chrome to be unable to load any web pages on Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_child_process_host.cc
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc
index 97e1220068ffc93f9690a3f3870303a42ddcc069..40b6598799cc55deb55ad34843031cc556c7a242 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();
}
« no previous file with comments | « chrome/browser/service/service_process_control.cc ('k') | content/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698