Convert mojo::system::ChannelEndpointClient to use our new refcounting stuff (instead of base's).

mojo/edk/system/channel_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/system/channel.h"
 
 #include <utility>
 
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/channel_test_base.h"
 #include "mojo/edk/system/message_pipe.h"
+#include "mojo/edk/system/ref_ptr.h"
 #include "mojo/edk/system/test_utils.h"
 #include "mojo/edk/system/waiter.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 using ChannelTest = test::ChannelTestBase;
 
 void DoNothing() {}
@@ skipping 11 matching lines @@
   *mutable_channel(0) = nullptr;
 }
 
 // ChannelTest.CloseBeforeAttachAndRun -----------------------------------------
 
 TEST_F(ChannelTest, CloseBeforeRun) {
   PostMethodToIOThreadAndWait(FROM_HERE,
                               &ChannelTest::CreateAndInitChannelOnIOThread, 0);
 
   RefPtr<ChannelEndpoint> channel_endpoint;
-  scoped_refptr<MessagePipe> mp(
-      MessagePipe::CreateLocalProxy(&channel_endpoint));
+  auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
   mp->Close(0);
 
   channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
   PostMethodToIOThreadAndWait(FROM_HERE,
                               &ChannelTest::ShutdownChannelOnIOThread, 0);
 
   channel(0)->AssertHasOneRef();
 }
 
 // ChannelTest.ShutdownAfterAttachAndRun ---------------------------------------
 
 TEST_F(ChannelTest, ShutdownAfterAttach) {
   PostMethodToIOThreadAndWait(FROM_HERE,
                               &ChannelTest::CreateAndInitChannelOnIOThread, 0);
 
   RefPtr<ChannelEndpoint> channel_endpoint;
-  scoped_refptr<MessagePipe> mp(
-      MessagePipe::CreateLocalProxy(&channel_endpoint));
+  auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
   channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
   Waiter waiter;
   waiter.Init();
   ASSERT_EQ(
       MOJO_RESULT_OK,
       mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr));
 
   // Don't wait for the shutdown to run ...
@@ skipping 13 matching lines @@
   channel(0)->AssertHasOneRef();
 }
 
 // ChannelTest.WaitAfterAttachRunAndShutdown -----------------------------------
 
 TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) {
   PostMethodToIOThreadAndWait(FROM_HERE,
                               &ChannelTest::CreateAndInitChannelOnIOThread, 0);
 
   RefPtr<ChannelEndpoint> channel_endpoint;
-  scoped_refptr<MessagePipe> mp(
-      MessagePipe::CreateLocalProxy(&channel_endpoint));
+  auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
   channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
   PostMethodToIOThreadAndWait(FROM_HERE,
                               &ChannelTest::ShutdownChannelOnIOThread, 0);
 
   Waiter waiter;
   waiter.Init();
   HandleSignalsState hss;
   EXPECT_EQ(
@@ skipping 12 matching lines @@
 TEST_F(ChannelTest, EndpointChannelShutdownRace) {
   const size_t kIterations = 1000;
 
   for (size_t i = 0; i < kIterations; i++) {
     // Need a new set of |RawChannel|s on every iteration.
     SetUp();
     PostMethodToIOThreadAndWait(
         FROM_HERE, &ChannelTest::CreateAndInitChannelOnIOThread, 0);
 
     RefPtr<ChannelEndpoint> channel_endpoint;
-    scoped_refptr<MessagePipe> mp(
-        MessagePipe::CreateLocalProxy(&channel_endpoint));
+    auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
     channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
     io_thread()->PostTask(
         FROM_HERE, base::Bind(&ChannelTest::ShutdownAndReleaseChannelOnIOThread,
                               base::Unretained(this), 0));
     mp->Close(0);
 
     // Wait for the IO thread to finish shutting down the channel.
     io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&DoNothing));
     EXPECT_FALSE(channel(0));
   }
 }
 
 // TODO(vtl): More. ------------------------------------------------------------
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo