EDK: Convert Core::GetAndRemoveDispatcher() to GetAndRemoveHandle().

mojo/edk/embedder/system_impl_private_entrypoints.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 "base/logging.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/handle.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/handle.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/result.h"
 #include "mojo/public/c/system/time.h"
 #include "mojo/public/c/system/wait.h"
 #include "mojo/public/platform/native/system_impl_private.h"
 
 using mojo::embedder::internal::g_core;
 using mojo::system::Core;
 using mojo::system::Dispatcher;
+using mojo::system::Handle;
 using mojo::system::MakeUserPointer;
 using mojo::util::RefPtr;
 
 // Definitions of the system functions, but with an explicit parameter for the
 // core object rather than using the default singleton. Also includes functions
 // for manipulating core objects.
 extern "C" {
 
 MojoSystemImpl MojoSystemImplGetDefaultImpl() {
   return static_cast<MojoSystemImpl>(g_core);
@@ skipping 15 matching lines @@
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   Core* to_core = static_cast<Core*>(to_system);
   if (to_core == nullptr)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   if (result_handle == nullptr)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
-  RefPtr<Dispatcher> d;
-  MojoResult result = from_core->GetAndRemoveDispatcher(handle, &d);
+  Handle h;
+  MojoResult result = from_core->GetAndRemoveHandle(handle, &h);
   if (result != MOJO_RESULT_OK)
     return result;
 
-  // TODO(vtl): The rights should come from the original handle (to be dealt
-  // with when I fix/replace |Core::GetAndRemoveDispatcher()|.
-  MojoHandle created_handle = to_core->AddHandle(mojo::system::Handle(
-      d.Clone(), MOJO_HANDLE_RIGHT_TRANSFER | MOJO_HANDLE_RIGHT_READ |
-                     MOJO_HANDLE_RIGHT_WRITE));
+  MojoHandle created_handle =
+      to_core->AddHandle(Handle(h.dispatcher.Clone(), h.rights));
   if (created_handle == MOJO_HANDLE_INVALID) {
     // The handle has been lost, unfortunately. There's no guarentee we can put
     // it back where it came from, or get the original ID back. Holding locks
     // for multiple cores risks deadlock, so that isn't a solution. This case
     // should not happen for reasonable uses of this API, however.
+    // TODO(vtl): This behaviour is pretty crappy. This can be fixed by marking
+    // the original handle as busy and only removing it on success, though
+    // that'd require some work.
     LOG(ERROR) << "Could not transfer handle";
-    d->Close();
+    h.dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
   MakeUserPointer(result_handle).Put(created_handle);
   return MOJO_RESULT_OK;
 }
 
 MojoTimeTicks MojoSystemImplGetTimeTicksNow(MojoSystemImpl system) {
   mojo::system::Core* core = static_cast<mojo::system::Core*>(system);
   DCHECK(core);
@@ skipping 229 matching lines @@
                          MakeUserPointer(buffer), flags);
 }
 
 MojoResult MojoSystemImplUnmapBuffer(MojoSystemImpl system, void* buffer) {
   mojo::system::Core* core = static_cast<mojo::system::Core*>(system);
   DCHECK(core);
   return core->UnmapBuffer(MakeUserPointer(buffer));
 }
 
 }  // extern "C"