EDK: Replace HandleTable::GetAndRemoveDispatcher() with 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 19 matching lines @@
 class PlatformSupport;
 }
 
 namespace system {
 
 class Dispatcher;
 struct HandleSignalsState;
 
 // |Core| is an object that implements the Mojo system calls. All public methods
 // are thread-safe.
+//
+// Convention: |MojoHandle|s are referred to as |handle| or |foo_handle|,
+// whereas |Handle|s are just |h|.
 class Core {
  public:
   // ---------------------------------------------------------------------------
 
   // These methods are only to be used by via the embedder API (and internally):
 
   // |*platform_support| must outlive this object.
   explicit Core(embedder::PlatformSupport* platform_support);
   virtual ~Core();
 
   // Adds |handle| (which must have a dispatcher) to the handle table, returning
   // the handle value for it. Returns |MOJO_HANDLE_INVALID| on failure, namely
   // if the handle table is full.
-  MojoHandle AddHandle(Handle&& handle);
+  MojoHandle AddHandle(Handle&& h);
 
   // Looks up the dispatcher for the given handle value. On success, gets the
   // dispatcher for a given handle value. On failure, returns an appropriate
   // result and leaves |dispatcher| alone), namely
   // |MOJO_RESULT_INVALID_ARGUMENT| if the handle value is invalid or
   // |MOJO_RESULT_BUSY| if the handle is marked as busy.
-  MojoResult GetDispatcher(MojoHandle handle_value,
+  MojoResult GetDispatcher(MojoHandle handle,
                            util::RefPtr<Dispatcher>* dispatcher);
 
   // Like |GetDispatcher()|, but on success also removes the handle from the
   // handle table.
-  MojoResult GetAndRemoveDispatcher(MojoHandle handle_value,
+  MojoResult GetAndRemoveDispatcher(MojoHandle handle,
                                     util::RefPtr<Dispatcher>* dispatcher);
 
   // Watches on the given handle for the given signals, calling |callback| when
   // a signal is satisfied or when all signals become unsatisfiable. |callback|
   // must satisfy stringent requirements -- see |Awakable::Awake()| in
   // awakable.h. In particular, it must not call any Mojo system functions.
   MojoResult AsyncWait(MojoHandle handle,
                        MojoHandleSignals signals,
                        const std::function<void(MojoResult)>& callback);
 
@@ skipping 135 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_