EDK: Replace HandleTable::GetAndRemoveDispatcher() with GetAndRemoveHandle().

mojo/edk/system/handle_table.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_HANDLE_TABLE_H_
 #define MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
 
 #include <stddef.h>
 
 #include <unordered_map>
@@ skipping 38 matching lines @@
   // convenient for there to be a "GetDispatcher()" that automatically does
   // rights-checking.)
 
   // On success, gets the handle for the given handle value (which should not be
   // |MOJO_HANDLE_INVALID|). On failure, returns an appropriate result (and
   // leaves |*handle| alone), namely |MOJO_RESULT_INVALID_ARGUMENT| if there's
   // no handle for the given handle value or |MOJO_RESULT_BUSY| if the handle is
   // marked as busy.
   MojoResult GetHandle(MojoHandle handle_value, Handle* handle);
 
-  // Like |GetDispatcher()|, but on success also removes the handle value from
-  // the handle table.
-  MojoResult GetAndRemoveDispatcher(MojoHandle handle_value,
-                                    util::RefPtr<Dispatcher>* dispatcher);
+  // Like |GetHandle()|, but on success also removes the handle value from the
+  // handle table.
+  MojoResult GetAndRemoveHandle(MojoHandle handle_value, Handle* handle);
 
   // Adds a handle (which must have a dispatcher), returning the handle value
   // for it. Returns |MOJO_HANDLE_INVALID| on failure (if the handle table is
   // full).
   MojoHandle AddHandle(Handle&& handle);
 
   // Adds a pair of handles (both of which must be valid), returning a pair of
   // handle values for them. On failure (if the handle table is full), the
   // (first and second) handle values will be |MOJO_HANDLE_INVALID|, and neither
   // dispatcher will be added.
@@ skipping 70 matching lines @@
   HandleToEntryMap handle_to_entry_map_;
   MojoHandle next_handle_value_;  // Invariant: never |MOJO_HANDLE_INVALID|.
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(HandleTable);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_HANDLE_TABLE_H_