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

mojo/edk/system/core.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_CORE_H_
 #define MOJO_EDK_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 45 matching lines @@
   // if the handle table is full.
   MojoHandle AddHandle(Handle&& h);
 
   // Gets the handle for the given handle value. On success, returns
   // |MOJO_RESULT_OK| (and sets |*h|). On failure, returns an appropriate result
   // (and leaves |*h| alone), namely |MOJO_RESULT_INVALID_ARGUMENT| if the
   // handle value is invalid or |MOJO_RESULT_BUSY| if the handle is marked as
   // busy.
   MojoResult GetHandle(MojoHandle handle, Handle* h);
 
-  // TODO(vtl): Convert this to |GetAndRemoveHandle()|.
-  // Like |GetDispatcher()|, but on success also removes the handle from the
+  // Like |GetHandle()|, but on success also removes the handle from the
   // handle table.
-  MojoResult GetAndRemoveDispatcher(MojoHandle handle,
-                                    util::RefPtr<Dispatcher>* dispatcher);
+  MojoResult GetAndRemoveHandle(MojoHandle handle, Handle* h);
 
   // Gets the dispatcher for the given handle value, which must have (all of)
   // the rights in |required_handle_rights|.
   //
   // On success, returns |MOJO_RESULT_OK| and sets |*dispatcher| appropriately.
   // On failure, returns:
   //   - |MOJO_RESULT_INVALID_ARGUMENT| if there's no handle for the given
   //     handle value (or the handle value was |MOJO_HANDLE_INVALID|),
   //   - |MOJO_RESULT_BUSY| if the handle is marked as busy,
   //   - |MOJO_RESULT_PERMISSION_DENIED| if the handle does not have the
@@ skipping 155 matching lines @@
   util::Mutex mapping_table_mutex_;
   MappingTable mapping_table_ MOJO_GUARDED_BY(mapping_table_mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CORE_H_