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

Unified Diff: content/browser/renderer_host/browser_render_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
« no previous file with comments | « content/browser/browser_child_process_host.cc ('k') | ipc/ipc_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/browser_render_process_host.cc
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 3b0619186ae3533b0947afe57ba8cb869f5a7518..256fb917a8d7a1ff4364a6697311140aa184a492 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -280,16 +280,9 @@ bool BrowserRenderProcessHost::Init(bool is_accessibility_enabled) {
// Setup the IPC channel.
const std::string channel_id =
ChildProcessInfo::GenerateRandomChannelID(this);
-#if defined(OS_LINUX)
- // See IPC::Channel::SetNeedsOverridePeerPid() for details.
- const bool needs_override_peer_pid = true;
-#else
- const bool needs_override_peer_pid = false;
-#endif
channel_.reset(new IPC::ChannelProxy(
channel_id, IPC::Channel::MODE_SERVER, this,
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
- needs_override_peer_pid));
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
// Call the embedder first so that their IPC filters have priority.
content::GetContentClient()->browser()->BrowserRenderProcessHostCreated(this);
@@ -898,17 +891,8 @@ void BrowserRenderProcessHost::OnProcessLaunched() {
if (deleting_soon_)
return;
- if (child_process_launcher_.get()) {
+ if (child_process_launcher_.get())
child_process_launcher_->SetProcessBackgrounded(backgrounded_);
-#if defined(OS_LINUX)
- // Inform the IPC subsystem of the global PID for this sandboxed renderer.
- if (channel_.get()) {
- base::ProcessHandle child_handle = child_process_launcher_->GetHandle();
- base::ProcessId child_pid = base::GetProcId(child_handle);
- channel_->OverridePeerPid(child_pid);
- }
-#endif
- }
if (max_page_id_ != -1)
Send(new ViewMsg_SetNextPageID(max_page_id_ + 1));
« no previous file with comments | « content/browser/browser_child_process_host.cc ('k') | ipc/ipc_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698