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

mojo/edk/system/core.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.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 87 matching lines @@
 }
 
 MojoResult Core::GetHandle(MojoHandle handle, Handle* h) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   MutexLocker locker(&handle_table_mutex_);
   return handle_table_.GetHandle(handle, h);
 }
 
-MojoResult Core::GetAndRemoveDispatcher(MojoHandle handle,
-                                        RefPtr<Dispatcher>* dispatcher) {
+MojoResult Core::GetAndRemoveHandle(MojoHandle handle, Handle* h) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   MutexLocker locker(&handle_table_mutex_);
-  Handle h;
-  MojoResult result = handle_table_.GetAndRemoveHandle(handle, &h);
-  if (result == MOJO_RESULT_OK)
-    *dispatcher = std::move(h.dispatcher);
-  return result;
+  return handle_table_.GetAndRemoveHandle(handle, h);
 }
 
 MojoResult Core::GetDispatcherAndCheckRights(
     MojoHandle handle,
     MojoHandleRights required_handle_rights,
     EntrypointClass entrypoint_class,
     util::RefPtr<Dispatcher>* dispatcher) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
@@ skipping 624 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return result;
 }
 
 }  // namespace system
 }  // namespace mojo