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

mojo/edk/system/channel_endpoint_unittest.cc

 // Copyright 2015 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_endpoint.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/synchronization/waitable_event.h"
@@ skipping 30 matching lines @@
         FROM_HERE, &ChannelEndpointTest::ShutdownChannelOnIOThread, 1);
 
     test::ChannelTestBase::TearDown();
   }
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelEndpointTest);
 };
 
 TEST_F(ChannelEndpointTest, Basic) {
-  scoped_refptr<test::TestChannelEndpointClient> client0(
-      new test::TestChannelEndpointClient());
-  auto endpoint0 = MakeRefCounted<ChannelEndpoint>(client0.get(), 0);
+  auto client0 = MakeRefCounted<test::TestChannelEndpointClient>();
+  auto endpoint0 = MakeRefCounted<ChannelEndpoint>(client0.Clone(), 0);
   client0->Init(0, endpoint0.Clone());
   channel(0)->SetBootstrapEndpoint(std::move(endpoint0));
 
-  scoped_refptr<test::TestChannelEndpointClient> client1(
-      new test::TestChannelEndpointClient());
-  auto endpoint1 = MakeRefCounted<ChannelEndpoint>(client1.get(), 1);
+  auto client1 = MakeRefCounted<test::TestChannelEndpointClient>();
+  auto endpoint1 = MakeRefCounted<ChannelEndpoint>(client1.Clone(), 1);
   client1->Init(1, endpoint1.Clone());
   channel(1)->SetBootstrapEndpoint(endpoint1.Clone());
 
   // We'll receive a message on channel/client 0.
   base::WaitableEvent read_event(true, false);
   client0->SetReadEvent(&read_event);
 
   // Make a test message.
   unsigned message_id = 0x12345678;
   std::unique_ptr<MessageInTransit> send_message =
@@ skipping 15 matching lines @@
   ASSERT_EQ(1u, client0->NumMessages());
   std::unique_ptr<MessageInTransit> read_message = client0->PopMessage();
   ASSERT_TRUE(read_message);
   test::VerifyTestMessage(read_message.get(), message_id);
 }
 
 // Checks that prequeued messages and messages sent at various stages later on
 // are all sent/received (and in the correct order). (Note: Due to the way
 // bootstrap endpoints work, the receiving side has to be set up first.)
 TEST_F(ChannelEndpointTest, Prequeued) {
-  scoped_refptr<test::TestChannelEndpointClient> client0(
-      new test::TestChannelEndpointClient());
-  auto endpoint0 = MakeRefCounted<ChannelEndpoint>(client0.get(), 0);
+  auto client0 = MakeRefCounted<test::TestChannelEndpointClient>();
+  auto endpoint0 = MakeRefCounted<ChannelEndpoint>(client0.Clone(), 0);
   client0->Init(0, endpoint0.Clone());
 
   channel(0)->SetBootstrapEndpoint(std::move(endpoint0));
   MessageInTransitQueue prequeued_messages;
   prequeued_messages.AddMessage(test::MakeTestMessage(1));
   prequeued_messages.AddMessage(test::MakeTestMessage(2));
 
-  scoped_refptr<test::TestChannelEndpointClient> client1(
-      new test::TestChannelEndpointClient());
+  auto client1 = MakeRefCounted<test::TestChannelEndpointClient>();
   auto endpoint1 =
-      MakeRefCounted<ChannelEndpoint>(client1.get(), 1, &prequeued_messages);
+      MakeRefCounted<ChannelEndpoint>(client1.Clone(), 1, &prequeued_messages);
   client1->Init(1, endpoint1.Clone());
 
   EXPECT_TRUE(endpoint1->EnqueueMessage(test::MakeTestMessage(3)));
   EXPECT_TRUE(endpoint1->EnqueueMessage(test::MakeTestMessage(4)));
 
   channel(1)->SetBootstrapEndpoint(endpoint1.Clone());
 
   EXPECT_TRUE(endpoint1->EnqueueMessage(test::MakeTestMessage(5)));
   EXPECT_TRUE(endpoint1->EnqueueMessage(test::MakeTestMessage(6)));
 
@@ skipping 11 matching lines @@
   for (unsigned message_id = 1; message_id <= 6; message_id++) {
     std::unique_ptr<MessageInTransit> read_message = client0->PopMessage();
     ASSERT_TRUE(read_message);
     test::VerifyTestMessage(read_message.get(), message_id);
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo