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

mojo/edk/system/handle_table.cc

 // 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.
 
 #include "mojo/edk/system/handle_table.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 31 matching lines @@
   HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle_value);
   if (it == handle_to_entry_map_.end())
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (it->second.busy)
     return MOJO_RESULT_BUSY;
   *handle = it->second.handle;
 
   return MOJO_RESULT_OK;
 }
 
-MojoResult HandleTable::GetAndRemoveDispatcher(MojoHandle handle_value,
-                                               RefPtr<Dispatcher>* dispatcher) {
+MojoResult HandleTable::GetAndRemoveHandle(MojoHandle handle_value,
+                                           Handle* handle) {
   DCHECK_NE(handle_value, MOJO_HANDLE_INVALID);
-  DCHECK(dispatcher);
+  DCHECK(handle);
 
   HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle_value);
   if (it == handle_to_entry_map_.end())
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (it->second.busy)
     return MOJO_RESULT_BUSY;
-  *dispatcher = std::move(it->second.handle.dispatcher);
+  *handle = std::move(it->second.handle);
   handle_to_entry_map_.erase(it);
 
   return MOJO_RESULT_OK;
 }
 
 MojoHandle HandleTable::AddHandle(Handle&& handle) {
   DCHECK(handle);
   return (handle_to_entry_map_.size() < max_handle_table_size_)
              ? AddHandleNoSizeCheck(std::move(handle))
              : MOJO_HANDLE_INVALID;
@@ skipping 193 matching lines @@
   for (uint32_t i = 0; i < num_handles; i++) {
     HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle_values[i]);
     DCHECK(it != handle_to_entry_map_.end());
     DCHECK(it->second.busy);
     it->second.busy = false;
   }
 }
 
 }  // namespace system
 }  // namespace mojo