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

mojo/edk/system/dispatcher.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 "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
@@ skipping 49 matching lines @@
     Channel* channel,
     void* destination,
     size_t* actual_size,
     embedder::PlatformHandleVector* platform_handles) {
   DCHECK(dispatcher);
   return dispatcher->EndSerializeAndClose(channel, destination, actual_size,
                                           platform_handles);
 }
 
 // static
-scoped_refptr<Dispatcher> Dispatcher::TransportDataAccess::Deserialize(
+RefPtr<Dispatcher> Dispatcher::TransportDataAccess::Deserialize(
     Channel* channel,
     int32_t type,
     const void* source,
     size_t size,
     embedder::PlatformHandleVector* platform_handles) {
   switch (static_cast<Dispatcher::Type>(type)) {
     case Type::UNKNOWN:
       DVLOG(2) << "Deserializing invalid handle";
       return nullptr;
     case Type::MESSAGE_PIPE:
-      return scoped_refptr<Dispatcher>(
-          MessagePipeDispatcher::Deserialize(channel, source, size));
+      return MessagePipeDispatcher::Deserialize(channel, source, size);
     case Type::DATA_PIPE_PRODUCER:
-      return scoped_refptr<Dispatcher>(
-          DataPipeProducerDispatcher::Deserialize(channel, source, size));
+      return DataPipeProducerDispatcher::Deserialize(channel, source, size);
     case Type::DATA_PIPE_CONSUMER:
-      return scoped_refptr<Dispatcher>(
-          DataPipeConsumerDispatcher::Deserialize(channel, source, size));
+      return DataPipeConsumerDispatcher::Deserialize(channel, source, size);
     case Type::SHARED_BUFFER:
-      return scoped_refptr<Dispatcher>(SharedBufferDispatcher::Deserialize(
-          channel, source, size, platform_handles));
+      return SharedBufferDispatcher::Deserialize(channel, source, size,
+                                                 platform_handles);
     case Type::PLATFORM_HANDLE:
-      return scoped_refptr<Dispatcher>(PlatformHandleDispatcher::Deserialize(
-          channel, source, size, platform_handles));
+      return PlatformHandleDispatcher::Deserialize(channel, source, size,
+                                                   platform_handles);
   }
   LOG(WARNING) << "Unknown dispatcher type " << type;
   return nullptr;
 }
 
 MojoResult Dispatcher::Close() {
   MutexLocker locker(&mutex_);
   if (is_closed_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
@@ skipping 84 matching lines @@
 MojoResult Dispatcher::EndReadData(uint32_t num_bytes_read) {
   MutexLocker locker(&mutex_);
   if (is_closed_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   return EndReadDataImplNoLock(num_bytes_read);
 }
 
 MojoResult Dispatcher::DuplicateBufferHandle(
     UserPointer<const MojoDuplicateBufferHandleOptions> options,
-    scoped_refptr<Dispatcher>* new_dispatcher) {
+    RefPtr<Dispatcher>* new_dispatcher) {
   MutexLocker locker(&mutex_);
   if (is_closed_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   return DuplicateBufferHandleImplNoLock(options, new_dispatcher);
 }
 
 MojoResult Dispatcher::MapBuffer(
     uint64_t offset,
     uint64_t num_bytes,
@@ skipping 132 matching lines @@
 
 MojoResult Dispatcher::EndReadDataImplNoLock(uint32_t /*num_bytes_read*/) {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
   // By default, not supported. Only needed for data pipe dispatchers.
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::DuplicateBufferHandleImplNoLock(
     UserPointer<const MojoDuplicateBufferHandleOptions> /*options*/,
-    scoped_refptr<Dispatcher>* /*new_dispatcher*/) {
+    RefPtr<Dispatcher>* /*new_dispatcher*/) {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
   // By default, not supported. Only needed for buffer dispatchers.
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::MapBufferImplNoLock(
     uint64_t /*offset*/,
     uint64_t /*num_bytes*/,
     MojoMapBufferFlags /*flags*/,
@@ skipping 32 matching lines @@
   DCHECK(!is_closed_);
   // By default, waiting isn't supported. Only dispatchers that can be waited on
   // will do something nontrivial.
   if (signals_state)
     *signals_state = HandleSignalsState();
 }
 
 void Dispatcher::StartSerializeImplNoLock(Channel* /*channel*/,
                                           size_t* max_size,
                                           size_t* max_platform_handles) {
-  DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
+  AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
   *max_size = 0;
   *max_platform_handles = 0;
 }
 
 bool Dispatcher::EndSerializeAndCloseImplNoLock(
     Channel* /*channel*/,
     void* /*destination*/,
     size_t* /*actual_size*/,
     embedder::PlatformHandleVector* /*platform_handles*/) {
-  DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
+  AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(is_closed_);
   // By default, serializing isn't supported, so just close.
   CloseImplNoLock();
   return false;
 }
 
 bool Dispatcher::IsBusyNoLock() const {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
   // Most dispatchers support only "atomic" operations, so they are never busy
   // (in this sense).
   return false;
 }
 
 void Dispatcher::CloseNoLock() {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
 
   is_closed_ = true;
   CancelAllAwakablesNoLock();
   CloseImplNoLock();
 }
 
-scoped_refptr<Dispatcher>
-Dispatcher::CreateEquivalentDispatcherAndCloseNoLock() {
+RefPtr<Dispatcher> Dispatcher::CreateEquivalentDispatcherAndCloseNoLock() {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
 
   is_closed_ = true;
   CancelAllAwakablesNoLock();
   return CreateEquivalentDispatcherAndCloseImplNoLock();
 }
 
 void Dispatcher::StartSerialize(Channel* channel,
                                 size_t* max_size,
                                 size_t* max_platform_handles) {
   DCHECK(channel);
   DCHECK(max_size);
   DCHECK(max_platform_handles);
-  DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
+  AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
   StartSerializeImplNoLock(channel, max_size, max_platform_handles);
 }
 
 bool Dispatcher::EndSerializeAndClose(
     Channel* channel,
     void* destination,
     size_t* actual_size,
     embedder::PlatformHandleVector* platform_handles) {
   DCHECK(channel);
   DCHECK(actual_size);
-  DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
+  AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
 
   // Like other |...Close()| methods, we mark ourselves as closed before calling
   // the impl. But there's no need to cancel waiters: we shouldn't have any (and
   // shouldn't be in |Core|'s handle table.
   is_closed_ = true;
 
 #if !defined(NDEBUG)
   // See the comment above |EndSerializeAndCloseImplNoLock()|. In brief: Locking
   // isn't actually needed, but we need to satisfy assertions (which we don't
   // want to remove or weaken).
   MutexLocker locker(&mutex_);
 #endif
 
   return EndSerializeAndCloseImplNoLock(channel, destination, actual_size,
                                         platform_handles);
 }
 
 // DispatcherTransport ---------------------------------------------------------
 
 void DispatcherTransport::End() {
   DCHECK(dispatcher_);
   dispatcher_->mutex_.Unlock();
   dispatcher_ = nullptr;
 }
 
 }  // namespace system
 }  // namespace mojo