Mojo: Rename PlatformChannelHandle to PlatformHandle, etc.

mojo/system/remote_message_pipe_posix_unittest.cc

 // Copyright 2013 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.
 
 // TODO(vtl): The POSIX-specific bits have been factored out. Apply this test to
 // non-POSIX once we have a non-POSIX implementation.
 
 #include <stdint.h>
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "mojo/system/channel.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_pipe.h"
-#include "mojo/system/platform_channel.h"
 #include "mojo/system/platform_channel_pair.h"
 #include "mojo/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/scoped_platform_handle.h"
 #include "mojo/system/test_utils.h"
 #include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 class RemoteMessagePipeTest : public testing::Test {
  public:
@@ skipping 52 matching lines @@
 
   scoped_refptr<base::TaskRunner> io_thread_task_runner() {
     return io_thread_message_loop()->message_loop_proxy();
   }
 
  private:
   void SetUpOnIOThread() {
     CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
 
     PlatformChannelPair channel_pair;
-    platform_channels_[0] = channel_pair.CreateServerChannel();
-    CHECK(platform_channels_[0].get());
-    CHECK(platform_channels_[0]->is_valid());
-    platform_channels_[1] = channel_pair.CreateClientChannel();
-    CHECK(platform_channels_[1].get());
-    CHECK(platform_channels_[1]->is_valid());
+    platform_handles_[0] = channel_pair.PassServerHandle();
+    platform_handles_[1] = channel_pair.PassClientHandle();
   }
 
   void CreateAndInitChannel(unsigned channel_index) {
     CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
     CHECK(!channels_[channel_index].get());
 
     channels_[channel_index] = new Channel();
     CHECK(channels_[channel_index]->Init(
-        platform_channels_[channel_index]->PassHandle()));
+        platform_handles_[channel_index].Pass()));
   }
 
   void ConnectMessagePipesOnIOThread(scoped_refptr<MessagePipe> mp_0,
                                      scoped_refptr<MessagePipe> mp_1) {
     CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
 
     if (!channels_[0].get())
       CreateAndInitChannel(0);
     if (!channels_[1].get())
       CreateAndInitChannel(1);
@@ skipping 27 matching lines @@
       channels_[0]->Shutdown();
       channels_[0] = NULL;
     }
     if (channels_[1].get()) {
       channels_[1]->Shutdown();
       channels_[1] = NULL;
     }
   }
 
   base::Thread io_thread_;
-  scoped_ptr<PlatformChannel> platform_channels_[2];
+  ScopedPlatformHandle platform_handles_[2];
   scoped_refptr<Channel> channels_[2];
 
   DISALLOW_COPY_AND_ASSIGN(RemoteMessagePipeTest);
 };
 
 TEST_F(RemoteMessagePipeTest, Basic) {
   const char hello[] = "hello";
   const char world[] = "world!!!1!!!1!";
   char buffer[100] = { 0 };
   uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));
@@ skipping 251 matching lines @@
                               MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
   EXPECT_EQ(0, strcmp(buffer, hello));
 
   // And MP 1, port 1.
   mp_1->Close(1);
 }
 }  // namespace
 }  // namespace system
 }  // namespace mojo