Make PlatformChannelPair "dumb".

mojo/edk/embedder/platform_channel_pair_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/embedder/platform_channel_pair.h"
 
 #include <errno.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
@@ skipping 49 matching lines @@
   }
 
  private:
   struct sigaction old_action_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformChannelPairTest);
 };
 
 TEST_F(PlatformChannelPairTest, NoSigPipe) {
   PlatformChannelPair channel_pair;
-  ScopedPlatformHandle server_handle = channel_pair.PassServerHandle();
-  ScopedPlatformHandle client_handle = channel_pair.PassClientHandle();
+  ScopedPlatformHandle server_handle = channel_pair.handle0.Pass();
+  ScopedPlatformHandle client_handle = channel_pair.handle1.Pass();
 
   // Write to the client.
   static const char kHello[] = "hello";
   EXPECT_EQ(static_cast<ssize_t>(sizeof(kHello)),
             write(client_handle.get().fd, kHello, sizeof(kHello)));
 
   // Close the client.
   client_handle.reset();
 
   // Read from the server; this should be okay.
@@ skipping 19 matching lines @@
   struct iovec iov[2] = {{const_cast<char*>(kHello), sizeof(kHello)},
                          {const_cast<char*>(kHello), sizeof(kHello)}};
   result = PlatformChannelWritev(server_handle.get(), iov, 2);
   EXPECT_EQ(-1, result);
   if (errno != EPIPE)
     PLOG(WARNING) << "write (expected EPIPE)";
 }
 
 TEST_F(PlatformChannelPairTest, SendReceiveData) {
   PlatformChannelPair channel_pair;
-  ScopedPlatformHandle server_handle = channel_pair.PassServerHandle();
-  ScopedPlatformHandle client_handle = channel_pair.PassClientHandle();
+  ScopedPlatformHandle server_handle = channel_pair.handle0.Pass();
+  ScopedPlatformHandle client_handle = channel_pair.handle1.Pass();
 
   for (size_t i = 0; i < 10; i++) {
     std::string send_string(1 << i, 'A' + i);
 
     EXPECT_EQ(static_cast<ssize_t>(send_string.size()),
               PlatformChannelWrite(server_handle.get(), send_string.data(),
                                    send_string.size()));
 
     WaitReadable(client_handle.get());
 
     char buf[10000] = {};
     std::deque<ScopedPlatformHandle> received_handles;
     ssize_t result = PlatformChannelRecvmsg(client_handle.get(), buf,
                                             sizeof(buf), &received_handles);
     EXPECT_EQ(static_cast<ssize_t>(send_string.size()), result);
     EXPECT_EQ(send_string, std::string(buf, static_cast<size_t>(result)));
     EXPECT_TRUE(received_handles.empty());
   }
 }
 
 TEST_F(PlatformChannelPairTest, SendReceiveFDs) {
   mojo::system::test::ScopedTestDir test_dir;
 
   static const char kHello[] = "hello";
 
   PlatformChannelPair channel_pair;
-  ScopedPlatformHandle server_handle = channel_pair.PassServerHandle();
-  ScopedPlatformHandle client_handle = channel_pair.PassClientHandle();
+  ScopedPlatformHandle server_handle = channel_pair.handle0.Pass();
+  ScopedPlatformHandle client_handle = channel_pair.handle1.Pass();
 
 // Reduce the number of FDs opened on OS X to avoid test flake.
 #if defined(OS_MACOSX)
   const size_t kNumHandlesToSend = kPlatformChannelMaxNumHandles / 2;
 #else
   const size_t kNumHandlesToSend = kPlatformChannelMaxNumHandles;
 #endif
 
   for (size_t i = 1; i < kNumHandlesToSend; i++) {
     // Make |i| files, with the j-th file consisting of j copies of the digit
@@ skipping 41 matching lines @@
     }
   }
 }
 
 TEST_F(PlatformChannelPairTest, AppendReceivedFDs) {
   mojo::system::test::ScopedTestDir test_dir;
 
   static const char kHello[] = "hello";
 
   PlatformChannelPair channel_pair;
-  ScopedPlatformHandle server_handle = channel_pair.PassServerHandle();
-  ScopedPlatformHandle client_handle = channel_pair.PassClientHandle();
+  ScopedPlatformHandle server_handle = channel_pair.handle0.Pass();
+  ScopedPlatformHandle client_handle = channel_pair.handle1.Pass();
 
   const std::string file_contents("hello world");
 
   {
     util::ScopedFILE fp(test_dir.CreateFile());
     ASSERT_TRUE(fp);
     ASSERT_EQ(file_contents.size(),
               fwrite(file_contents.data(), 1, file_contents.size(), fp.get()));
     std::vector<ScopedPlatformHandle> platform_handles;
     platform_handles.push_back(test::PlatformHandleFromFILE(std::move(fp)));
@@ skipping 33 matching lines @@
     char read_buf[100];
     size_t bytes_read = fread(read_buf, 1, sizeof(read_buf), fp.get());
     EXPECT_EQ(file_contents.size(), bytes_read);
     EXPECT_EQ(file_contents, std::string(read_buf, bytes_read));
   }
 }
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo