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
CrOS-Libchrome-Original-Commit: bf84c589154a261c540ba514a0cbf600d77e3c9f
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index d047b78..792e3d6 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -118,8 +118,7 @@
ChannelProxy(const IPC::ChannelHandle& channel_handle,
Channel::Mode mode,
Channel::Listener* listener,
- base::MessageLoopProxy* ipc_thread_loop,
- bool needs_override_peer_pid);
+ base::MessageLoopProxy* ipc_thread_loop);
virtual ~ChannelProxy();
@@ -162,11 +161,6 @@
bool GetClientEuid(uid_t* client_euid) const;
#endif // defined(OS_POSIX)
-#if defined(OS_LINUX)
- // Calls through to the underlying channel's method.
- void OverridePeerPid(int32 peer_pid);
-#endif // defined(OS_LINUX)
-
protected:
class Context;
// A subclass uses this constructor if it needs to add more information
@@ -175,7 +169,6 @@
ChannelProxy(const IPC::ChannelHandle& channel_handle,
Channel::Mode mode,
base::MessageLoopProxy* ipc_thread_loop,
- bool needs_override_peer_pid,
Context* context,
bool create_pipe_now);
@@ -224,16 +217,12 @@
// Create the Channel
void CreateChannel(const IPC::ChannelHandle& channel_handle,
- const Channel::Mode& mode,
- bool needs_override_peer_pid);
+ const Channel::Mode& mode);
// Methods called on the IO thread.
void OnSendMessage(Message* message_ptr);
void OnAddFilter();
void OnRemoveFilter(MessageFilter* filter);
-#if defined(OS_LINUX)
- void OnOverridePeerPid(int32 peer_pid);
-#endif
// Methods called on the listener thread.
void AddFilter(MessageFilter* filter);
@@ -268,8 +257,7 @@
friend class SendTask;
void Init(const IPC::ChannelHandle& channel_handle, Channel::Mode mode,
- base::MessageLoopProxy* ipc_thread_loop, bool create_pipe_now,
- bool needs_override_peer_pid);
+ base::MessageLoopProxy* ipc_thread_loop, bool create_pipe_now);
// By maintaining this indirection (ref-counted) to our internal state, we
// can safely be destroyed while the background thread continues to do stuff