mojo: Delete Channel::Message::TakeHandlesForTransport()

It was only needed for ChannelPosix because Mach ports could not be
transferred with the message data. Now that ChannelMac exists, just
TakeHandles() is needed.

Bug: 973882
Change-Id: I83e754ea9877f4d355654ee069b5a6be0a14c1a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733926Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683747}

mojo/core/channel.cc

@@ -447,17 +447,6 @@ std::vector<PlatformHandleInTransit> Channel::Message::TakeHandles() {
   return std::move(handle_vector_);
 }
 
-std::vector<PlatformHandleInTransit>
-Channel::Message::TakeHandlesForTransport() {
-#if defined(OS_WIN)
-  // Not necessary on Windows.
-  NOTREACHED();
-  return std::vector<PlatformHandleInTransit>();
-#else
-  return std::move(handle_vector_);
-#endif
-}
-
 // Helper class for managing a Channel's read buffer allocations. This maintains
 // a single contiguous buffer with the layout:
 //

mojo/core/channel.h

@@ -200,11 +200,6 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel
     void SetHandles(std::vector<PlatformHandle> new_handles);
     void SetHandles(std::vector<PlatformHandleInTransit> new_handles);
     std::vector<PlatformHandleInTransit> TakeHandles();
-    // Version of TakeHandles that returns a vector of platform handles suitable
-    // for transfer over an underlying OS mechanism. i.e. file descriptors over
-    // a unix domain socket. Any handle that cannot be transferred this way,
-    // such as Mach ports, will be removed.
-    std::vector<PlatformHandleInTransit> TakeHandlesForTransport();
 
     void SetVersionForTest(uint16_t version_number);
 

mojo/core/channel_fuchsia.cc

@@ -95,7 +95,7 @@ class MessageView {
   MessageView(Channel::MessagePtr message, size_t offset)
       : message_(std::move(message)),
         offset_(offset),
-        handles_(message_->TakeHandlesForTransport()) {
+        handles_(message_->TakeHandles()) {
     DCHECK_GT(message_->data_num_bytes(), offset_);
   }
 

mojo/core/channel_posix.cc

@@ -43,7 +43,7 @@ class MessageView {
   MessageView(Channel::MessagePtr message, size_t offset)
       : message_(std::move(message)),
         offset_(offset),
-        handles_(message_->TakeHandlesForTransport()) {
+        handles_(message_->TakeHandles()) {
     DCHECK(!message_->data_num_bytes() || message_->data_num_bytes() > offset_);
   }