EDK: Remove Core::AddDispatcher().

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"
 
@@ skipping 33 matching lines @@
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   if (result_handle == nullptr)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   RefPtr<Dispatcher> d;
   MojoResult result = from_core->GetAndRemoveDispatcher(handle, &d);
   if (result != MOJO_RESULT_OK)
     return result;
 
-  MojoHandle created_handle = to_core->AddDispatcher(d.get());
+  // 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));
   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.
     LOG(ERROR) << "Could not transfer handle";
     d->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
@@ skipping 236 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"