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

mojo/edk/system/shared_buffer_dispatcher.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
 #define MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_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/simple_dispatcher.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSupport;
 }
 
 namespace system {
@@ skipping 11 matching lines @@
   // Validates and/or sets default options for |MojoCreateSharedBufferOptions|.
   // If non-null, |in_options| must point to a struct of at least
   // |in_options->struct_size| bytes. |out_options| must point to a (current)
   // |MojoCreateSharedBufferOptions| and will be entirely overwritten on success
   // (it may be partly overwritten on failure).
   static MojoResult ValidateCreateOptions(
       UserPointer<const MojoCreateSharedBufferOptions> in_options,
       MojoCreateSharedBufferOptions* out_options);
 
   // Static factory method: |validated_options| must be validated (obviously).
-  // On failure, |*result| will be left as-is.
-  // TODO(vtl): This should probably be made to return a scoped_refptr and have
-  // a MojoResult out parameter instead.
-  static MojoResult Create(
+  // Returns null on error; |*result| will be set to an appropriate result
+  // code).
+  static RefPtr<SharedBufferDispatcher> Create(
       embedder::PlatformSupport* platform_support,
       const MojoCreateSharedBufferOptions& validated_options,
       uint64_t num_bytes,
-      scoped_refptr<SharedBufferDispatcher>* result);
+      MojoResult* result);
 
   // |Dispatcher| public methods:
   Type GetType() const override;
 
   // The "opposite" of |SerializeAndClose()|. (Typically this is called by
   // |Dispatcher::Deserialize()|.)
-  static scoped_refptr<SharedBufferDispatcher> Deserialize(
+  static RefPtr<SharedBufferDispatcher> Deserialize(
       Channel* channel,
       const void* source,
       size_t size,
       embedder::PlatformHandleVector* platform_handles);
 
  private:
-  static scoped_refptr<SharedBufferDispatcher> CreateInternal(
+  static RefPtr<SharedBufferDispatcher> CreateInternal(
       scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer) {
-    return make_scoped_refptr(new SharedBufferDispatcher(shared_buffer.Pass()));
+    return AdoptRef(new SharedBufferDispatcher(shared_buffer.Pass()));
   }
 
   explicit SharedBufferDispatcher(
       scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer);
   ~SharedBufferDispatcher() override;
 
   // Validates and/or sets default options for
   // |MojoDuplicateBufferHandleOptions|. If non-null, |in_options| must point to
   // a struct of at least |in_options->struct_size| bytes. |out_options| must
   // point to a (current) |MojoDuplicateBufferHandleOptions| and will be
   // entirely overwritten on success (it may be partly overwritten on failure).
   static MojoResult ValidateDuplicateOptions(
       UserPointer<const MojoDuplicateBufferHandleOptions> in_options,
       MojoDuplicateBufferHandleOptions* out_options);
 
   // |Dispatcher| protected methods:
   void CloseImplNoLock() override;
-  scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
-      override;
+  RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override;
   MojoResult DuplicateBufferHandleImplNoLock(
       UserPointer<const MojoDuplicateBufferHandleOptions> options,
-      scoped_refptr<Dispatcher>* new_dispatcher) override;
+      RefPtr<Dispatcher>* new_dispatcher) override;
   MojoResult MapBufferImplNoLock(
       uint64_t offset,
       uint64_t num_bytes,
       MojoMapBufferFlags flags,
       std::unique_ptr<embedder::PlatformSharedBufferMapping>* mapping) override;
   void StartSerializeImplNoLock(Channel* channel,
                                 size_t* max_size,
                                 size_t* max_platform_handles) override
       MOJO_NOT_THREAD_SAFE;
   bool EndSerializeAndCloseImplNoLock(
       Channel* channel,
       void* destination,
       size_t* actual_size,
       embedder::PlatformHandleVector* platform_handles) override
       MOJO_NOT_THREAD_SAFE;
 
   scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer_
       MOJO_GUARDED_BY(mutex());
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(SharedBufferDispatcher);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_