Revert 227999 "Alternative workaround for mac kernel bug."

> Alternative workaround for mac kernel bug.
> 
> BUG=298276
> 
> Review URL: https://codereview.chromium.org/25325002

This change seemed to cause the Mac ASAN bot to timeout when running
the ipc_tests.

TBR=hubbe@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228110 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 11 deletions

diff --git a/ipc/ipc_channel_posix.h b/ipc/ipc_channel_posix.h
index 1e587c1..645a130 100644
--- a/ipc/ipc_channel_posix.h
+++ b/ipc/ipc_channel_posix.h
@@ -10,7 +10,6 @@
 #include <sys/socket.h>  // for CMSG macros
 
 #include <queue>
-#include <set>
 #include <string>
 #include <vector>
 
@@ -81,8 +80,6 @@ class Channel::ChannelImpl : public internal::ChannelReader,
   void ClosePipeOnError();
   int GetHelloMessageProcId();
   void QueueHelloMessage();
-  void CloseFileDescriptors(Message* msg);
-  void QueueCloseFDMessage(int fd, int hops);
 
   // ChannelReader implementation.
   virtual ReadState ReadData(char* buffer,
@@ -90,7 +87,7 @@ class Channel::ChannelImpl : public internal::ChannelReader,
                              int* bytes_read) OVERRIDE;
   virtual bool WillDispatchInputMessage(Message* msg) OVERRIDE;
   virtual bool DidEmptyInputBuffers() OVERRIDE;
-  virtual void HandleInternalMessage(const Message& msg) OVERRIDE;
+  virtual void HandleHelloMessage(const Message& msg) OVERRIDE;
 
 #if defined(IPC_USES_READWRITE)
   // Reads the next message from the fd_pipe_ and appends them to the
@@ -187,13 +184,6 @@ class Channel::ChannelImpl : public internal::ChannelReader,
   // implementation!
   std::vector<int> input_fds_;
 
-#if defined(OS_MACOSX)
-  // On OSX, sent FDs must not be closed until we get an ack.
-  // Keep track of sent FDs here to make sure the remote is not
-  // trying to bamboozle us.
-  std::set<int> fds_to_close_;
-#endif
-
   // True if we are responsible for unlinking the unix domain socket file.
   bool must_unlink_;