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

mojo/edk/system/dispatcher_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.
 
 #include "mojo/edk/system/dispatcher.h"
 
 #include <memory>
 #include <vector>
 
-#include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/system/memory.h"
+#include "mojo/edk/system/ref_ptr.h"
 #include "mojo/edk/system/waiter.h"
 #include "mojo/edk/test/simple_test_thread.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 // Trivial subclass that makes the constructor public.
 class TrivialDispatcher final : public Dispatcher {
  public:
-  TrivialDispatcher() {}
+  // Note: Use |MakeRefCounted<TrivialDispatcher>()|.
 
   Type GetType() const override { return Type::UNKNOWN; }
 
  private:
+  FRIEND_MAKE_REF_COUNTED(TrivialDispatcher);
+
+  TrivialDispatcher() {}
   ~TrivialDispatcher() override {}
 
-  scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
-      override {
+  RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override {
     mutex().AssertHeld();
-    return scoped_refptr<Dispatcher>(new TrivialDispatcher());
+    return AdoptRef(new TrivialDispatcher());
   }
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TrivialDispatcher);
 };
 
 TEST(DispatcherTest, Basic) {
-  scoped_refptr<Dispatcher> d(new TrivialDispatcher());
+  auto d = MakeRefCounted<TrivialDispatcher>();
 
   EXPECT_EQ(Dispatcher::Type::UNKNOWN, d->GetType());
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteMessage(NullUserPointer(), 0, nullptr,
                             MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadMessage(NullUserPointer(), NullUserPointer(), nullptr,
                            nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
@@ skipping 73 matching lines @@
     BEGIN_READ_DATA,
     END_READ_DATA,
     DUPLICATE_BUFFER_HANDLE,
     MAP_BUFFER,
     ADD_WAITER,
     REMOVE_WAITER,
     DISPATCHER_OP_COUNT
   };
 
   ThreadSafetyStressThread(base::WaitableEvent* event,
-                           scoped_refptr<Dispatcher> dispatcher,
+                           RefPtr<Dispatcher> dispatcher,
                            DispatcherOp op)
       : event_(event), dispatcher_(dispatcher), op_(op) {
     CHECK_LE(0, op_);
     CHECK_LT(op_, DISPATCHER_OP_COUNT);
   }
 
   ~ThreadSafetyStressThread() override { Join(); }
 
  private:
   void Run() override {
@@ skipping 40 matching lines @@
       case BEGIN_READ_DATA:
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher_->BeginReadData(NullUserPointer(), NullUserPointer(),
                                        MOJO_READ_DATA_FLAG_NONE));
         break;
       case END_READ_DATA:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, dispatcher_->EndReadData(0));
         break;
       case DUPLICATE_BUFFER_HANDLE: {
-        scoped_refptr<Dispatcher> unused;
+        RefPtr<Dispatcher> unused;
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher_->DuplicateBufferHandle(NullUserPointer(), &unused));
         break;
       }
       case MAP_BUFFER: {
         std::unique_ptr<embedder::PlatformSharedBufferMapping> unused;
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher_->MapBuffer(0u, 0u, MOJO_MAP_BUFFER_FLAG_NONE, &unused));
@@ skipping 22 matching lines @@
     }
 
     // Always try to remove the waiter, in case we added it.
     HandleSignalsState hss;
     dispatcher_->RemoveAwakable(&waiter_, &hss);
     EXPECT_EQ(0u, hss.satisfied_signals);
     EXPECT_EQ(0u, hss.satisfiable_signals);
   }
 
   base::WaitableEvent* const event_;
-  const scoped_refptr<Dispatcher> dispatcher_;
+  const RefPtr<Dispatcher> dispatcher_;
   const DispatcherOp op_;
 
   Waiter waiter_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ThreadSafetyStressThread);
 };
 
 TEST(DispatcherTest, ThreadSafetyStress) {
   static const size_t kRepeatCount = 20;
   static const size_t kNumThreads = 100;
 
   for (size_t i = 0; i < kRepeatCount; i++) {
     // Manual reset, not initially signalled.
     base::WaitableEvent event(true, false);
-    scoped_refptr<Dispatcher> d(new TrivialDispatcher());
+    auto d = MakeRefCounted<TrivialDispatcher>();
 
     {
       std::vector<std::unique_ptr<ThreadSafetyStressThread>> threads;
       for (size_t j = 0; j < kNumThreads; j++) {
         ThreadSafetyStressThread::DispatcherOp op =
             static_cast<ThreadSafetyStressThread::DispatcherOp>(
                 (i + j) % ThreadSafetyStressThread::DISPATCHER_OP_COUNT);
         threads.push_back(
             util::MakeUnique<ThreadSafetyStressThread>(&event, d, op));
         threads.back()->Start();
       }
       // Kicks off real work on the threads:
       event.Signal();
     }  // Joins all the threads.
 
     // One of the threads should already have closed the dispatcher.
     EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->Close());
   }
 }
 
 TEST(DispatcherTest, ThreadSafetyStressNoClose) {
   static const size_t kRepeatCount = 20;
   static const size_t kNumThreads = 100;
 
   for (size_t i = 0; i < kRepeatCount; i++) {
     // Manual reset, not initially signalled.
     base::WaitableEvent event(true, false);
-    scoped_refptr<Dispatcher> d(new TrivialDispatcher());
+    auto d = MakeRefCounted<TrivialDispatcher>();
 
     {
       std::vector<std::unique_ptr<ThreadSafetyStressThread>> threads;
       for (size_t j = 0; j < kNumThreads; j++) {
         ThreadSafetyStressThread::DispatcherOp op =
             static_cast<ThreadSafetyStressThread::DispatcherOp>(
                 (i + j) % (ThreadSafetyStressThread::DISPATCHER_OP_COUNT - 1) +
                 1);
         threads.push_back(
             util::MakeUnique<ThreadSafetyStressThread>(&event, d, op));
         threads.back()->Start();
       }
       // Kicks off real work on the threads:
       event.Signal();
     }  // Joins all the threads.
 
     EXPECT_EQ(MOJO_RESULT_OK, d->Close());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo