Commit cfdd7ba3 authored by morrita's avatar morrita Committed by Commit bot

Remove IPC::Channel::TakePipeHandle()

It doesn't work, and it is no longer used.

BUG=416208
R=cpu@chromium.org, jam@chromium.org

Review URL: https://codereview.chromium.org/601563002

Cr-Commit-Position: refs/heads/master@{#296820}
parent 42d5525e
...@@ -173,11 +173,6 @@ class IPC_EXPORT Channel : public Sender { ...@@ -173,11 +173,6 @@ class IPC_EXPORT Channel : public Sender {
// Get its own process id. This value is told to the peer. // Get its own process id. This value is told to the peer.
virtual base::ProcessId GetSelfPID() const = 0; virtual base::ProcessId GetSelfPID() const = 0;
// Return connected ChannelHandle which the channel has owned.
// This method transfers the ownership to the caller
// so the channel isn't valid after the call.
virtual ChannelHandle TakePipeHandle() WARN_UNUSED_RESULT = 0;
// Send a message over the Channel to the listener on the other end. // Send a message over the Channel to the listener on the other end.
// //
// |message| must be allocated using operator new. This object will be // |message| must be allocated using operator new. This object will be
......
...@@ -149,11 +149,6 @@ base::ProcessId ChannelNacl::GetSelfPID() const { ...@@ -149,11 +149,6 @@ base::ProcessId ChannelNacl::GetSelfPID() const {
return -1; return -1;
} }
ChannelHandle ChannelNacl::TakePipeHandle() {
// NACL doesn't have any platform-level handles.
return ChannelHandle();
}
bool ChannelNacl::Connect() { bool ChannelNacl::Connect() {
if (pipe_ == -1) { if (pipe_ == -1) {
DLOG(WARNING) << "Channel creation failed: " << pipe_name_; DLOG(WARNING) << "Channel creation failed: " << pipe_name_;
......
...@@ -43,7 +43,6 @@ class ChannelNacl : public Channel, ...@@ -43,7 +43,6 @@ class ChannelNacl : public Channel,
// Channel implementation. // Channel implementation.
virtual base::ProcessId GetPeerPID() const OVERRIDE; virtual base::ProcessId GetPeerPID() const OVERRIDE;
virtual base::ProcessId GetSelfPID() const OVERRIDE; virtual base::ProcessId GetSelfPID() const OVERRIDE;
virtual ChannelHandle TakePipeHandle() OVERRIDE;
virtual bool Connect() OVERRIDE; virtual bool Connect() OVERRIDE;
virtual void Close() OVERRIDE; virtual void Close() OVERRIDE;
virtual bool Send(Message* message) OVERRIDE; virtual bool Send(Message* message) OVERRIDE;
......
...@@ -1052,13 +1052,6 @@ base::ProcessId ChannelPosix::GetSelfPID() const { ...@@ -1052,13 +1052,6 @@ base::ProcessId ChannelPosix::GetSelfPID() const {
return GetHelloMessageProcId(); return GetHelloMessageProcId();
} }
ChannelHandle ChannelPosix::TakePipeHandle() {
ChannelHandle handle = ChannelHandle(pipe_name_,
base::FileDescriptor(pipe_, false));
pipe_ = -1;
return handle;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Channel's methods // Channel's methods
......
...@@ -63,7 +63,6 @@ class IPC_EXPORT ChannelPosix : public Channel, ...@@ -63,7 +63,6 @@ class IPC_EXPORT ChannelPosix : public Channel,
virtual bool Send(Message* message) OVERRIDE; virtual bool Send(Message* message) OVERRIDE;
virtual base::ProcessId GetPeerPID() const OVERRIDE; virtual base::ProcessId GetPeerPID() const OVERRIDE;
virtual base::ProcessId GetSelfPID() const OVERRIDE; virtual base::ProcessId GetSelfPID() const OVERRIDE;
virtual ChannelHandle TakePipeHandle() OVERRIDE;
virtual int GetClientFileDescriptor() const OVERRIDE; virtual int GetClientFileDescriptor() const OVERRIDE;
virtual int TakeClientFileDescriptor() OVERRIDE; virtual int TakeClientFileDescriptor() OVERRIDE;
......
...@@ -144,12 +144,6 @@ base::ProcessId ChannelWin::GetSelfPID() const { ...@@ -144,12 +144,6 @@ base::ProcessId ChannelWin::GetSelfPID() const {
return GetCurrentProcessId(); return GetCurrentProcessId();
} }
ChannelHandle ChannelWin::TakePipeHandle() {
ChannelHandle handle = ChannelHandle(pipe_);
pipe_ = INVALID_HANDLE_VALUE;
return handle;
}
// static // static
bool ChannelWin::IsNamedServerInitialized( bool ChannelWin::IsNamedServerInitialized(
const std::string& channel_id) { const std::string& channel_id) {
......
...@@ -36,7 +36,6 @@ class ChannelWin : public Channel, ...@@ -36,7 +36,6 @@ class ChannelWin : public Channel,
virtual bool Send(Message* message) OVERRIDE; virtual bool Send(Message* message) OVERRIDE;
virtual base::ProcessId GetPeerPID() const OVERRIDE; virtual base::ProcessId GetPeerPID() const OVERRIDE;
virtual base::ProcessId GetSelfPID() const OVERRIDE; virtual base::ProcessId GetSelfPID() const OVERRIDE;
virtual ChannelHandle TakePipeHandle() OVERRIDE;
static bool IsNamedServerInitialized(const std::string& channel_id); static bool IsNamedServerInitialized(const std::string& channel_id);
......
...@@ -40,11 +40,6 @@ base::ProcessId TestSink::GetSelfPID() const { ...@@ -40,11 +40,6 @@ base::ProcessId TestSink::GetSelfPID() const {
return base::ProcessId(); return base::ProcessId();
} }
ChannelHandle TestSink::TakePipeHandle() {
NOTIMPLEMENTED();
return ChannelHandle();
}
bool TestSink::OnMessageReceived(const Message& msg) { bool TestSink::OnMessageReceived(const Message& msg) {
ObserverListBase<Listener>::Iterator it(filter_list_); ObserverListBase<Listener>::Iterator it(filter_list_);
Listener* observer; Listener* observer;
......
...@@ -82,7 +82,6 @@ class TestSink : public Channel { ...@@ -82,7 +82,6 @@ class TestSink : public Channel {
virtual void Close() OVERRIDE; virtual void Close() OVERRIDE;
virtual base::ProcessId GetPeerPID() const OVERRIDE; virtual base::ProcessId GetPeerPID() const OVERRIDE;
virtual base::ProcessId GetSelfPID() const OVERRIDE; virtual base::ProcessId GetSelfPID() const OVERRIDE;
virtual ChannelHandle TakePipeHandle() OVERRIDE;
#if defined(OS_POSIX) && !defined(OS_NACL) #if defined(OS_POSIX) && !defined(OS_NACL)
virtual int GetClientFileDescriptor() const OVERRIDE; virtual int GetClientFileDescriptor() const OVERRIDE;
......
...@@ -191,11 +191,6 @@ base::ProcessId ChannelMojo::GetSelfPID() const { ...@@ -191,11 +191,6 @@ base::ProcessId ChannelMojo::GetSelfPID() const {
return base::GetCurrentProcId(); return base::GetCurrentProcId();
} }
ChannelHandle ChannelMojo::TakePipeHandle() {
NOTREACHED();
return ChannelHandle();
}
void ChannelMojo::OnClientLaunched(base::ProcessHandle handle) { void ChannelMojo::OnClientLaunched(base::ProcessHandle handle) {
bootstrap_->OnClientLaunched(handle); bootstrap_->OnClientLaunched(handle);
} }
......
...@@ -89,7 +89,6 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel, ...@@ -89,7 +89,6 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
virtual bool Send(Message* message) OVERRIDE; virtual bool Send(Message* message) OVERRIDE;
virtual base::ProcessId GetPeerPID() const OVERRIDE; virtual base::ProcessId GetPeerPID() const OVERRIDE;
virtual base::ProcessId GetSelfPID() const OVERRIDE; virtual base::ProcessId GetSelfPID() const OVERRIDE;
virtual ChannelHandle TakePipeHandle() OVERRIDE;
#if defined(OS_POSIX) && !defined(OS_NACL) #if defined(OS_POSIX) && !defined(OS_NACL)
virtual int GetClientFileDescriptor() const OVERRIDE; virtual int GetClientFileDescriptor() const OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment