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

mojo/edk/system/core_test_base.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/core_test_base.h"
 
 #include <vector>
 
 #include "base/logging.h"
-#include "base/memory/ref_counted.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/memory.h"
+#include "mojo/edk/system/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 namespace test {
 
 namespace {
 
 // MockDispatcher --------------------------------------------------------------
 
 class MockDispatcher : public Dispatcher {
  public:
-  static scoped_refptr<MockDispatcher> Create(
-      CoreTestBase::MockHandleInfo* info) {
-    return make_scoped_refptr(new MockDispatcher(info));
+  static RefPtr<MockDispatcher> Create(CoreTestBase::MockHandleInfo* info) {
+    return AdoptRef(new MockDispatcher(info));
   }
 
   // |Dispatcher| private methods:
   Type GetType() const override { return Type::UNKNOWN; }
 
  private:
   explicit MockDispatcher(CoreTestBase::MockHandleInfo* info) : info_(info) {
     CHECK(info_);
     info_->IncrementCtorCallCount();
   }
@@ skipping 109 matching lines @@
     mutex().AssertHeld();
     if (signals_state)
       *signals_state = HandleSignalsState();
   }
 
   void CancelAllAwakablesNoLock() override {
     info_->IncrementCancelAllAwakablesCallCount();
     mutex().AssertHeld();
   }
 
-  scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
-      override {
+  RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override {
     return Create(info_);
   }
 
   CoreTestBase::MockHandleInfo* const info_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MockDispatcher);
 };
 
 }  // namespace
 
 // CoreTestBase ----------------------------------------------------------------
 
 CoreTestBase::CoreTestBase() {
 }
 
 CoreTestBase::~CoreTestBase() {
 }
 
 void CoreTestBase::SetUp() {
   core_ = new Core(&platform_support_);
 }
 
 void CoreTestBase::TearDown() {
   delete core_;
   core_ = nullptr;
 }
 
 MojoHandle CoreTestBase::CreateMockHandle(CoreTestBase::MockHandleInfo* info) {
   CHECK(core_);
-  scoped_refptr<MockDispatcher> dispatcher = MockDispatcher::Create(info);
-  return core_->AddDispatcher(dispatcher);
+  auto dispatcher = MockDispatcher::Create(info);
+  MojoHandle rv = core_->AddDispatcher(dispatcher.get());
+  CHECK_NE(rv, MOJO_HANDLE_INVALID);
+  return rv;
 }
 
 // CoreTestBase_MockHandleInfo -------------------------------------------------
 
 CoreTestBase_MockHandleInfo::CoreTestBase_MockHandleInfo()
     : ctor_call_count_(0),
       dtor_call_count_(0),
       close_call_count_(0),
       write_message_call_count_(0),
       read_message_call_count_(0),
@@ skipping 173 matching lines @@
 }
 
 void CoreTestBase_MockHandleInfo::AwakableWasAdded(Awakable* awakable) {
   MutexLocker locker(&mutex_);
   added_awakables_.push_back(awakable);
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo