Couple of small cleanups to MessagePumpMojo.

mojo/message_pump/message_pump_mojo.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_MESSAGE_PUMP_MESSAGE_PUMP_MOJO_H_
 #define MOJO_MESSAGE_PUMP_MESSAGE_PUMP_MOJO_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 85 matching lines @@
   // Waits for handles in the wait set to become ready. Returns |true| if ready
   // handles may be available, or |false| if the wait's deadline was exceeded.
   // Note, ready handles may be unavailable, even though |true| was returned.
   bool WaitForReadyHandles(const RunState& run_state) const;
 
   // Retrieves any 'ready' handles from the wait set, and runs the handler's
   // OnHandleReady() or OnHandleError() functions as necessary. Returns |true|
   // if any handles were ready and processed.
   bool ProcessReadyHandles();
 
-  // Removes the given invalid handle. This is called if MojoGetReadyHandles
-  // finds an invalid or closed handle.
-  void RemoveInvalidHandle(MojoResult result, Handle handle);
-
   // Removes any handles that have expired their deadline. Runs the handler's
   // OnHandleError() function with |MOJO_RESULT_DEADLINE_EXCEEDED| as the
   // result. Returns |true| if any handles were removed.
   bool RemoveExpiredHandles();
 
   void SignalControlPipe();
 
   // Returns the deadline for the call to MojoWait().
   MojoDeadline GetDeadlineForWait(const RunState& run_state) const;
 
   // Run |OnHandleReady()| for the handler registered with |handle|. |handle|
   // must be registered.
   void SignalHandleReady(Handle handle);
 
+  // Run |OnHandleError()| for the handler registered with |handle| and the
+  // error code |result|. |handle| must be registered, and will be removed
+  // before calling |OnHandleError()|.
+  void SignalHandleError(Handle handle, MojoResult result);
+
   void WillSignalHandler();
   void DidSignalHandler();
 
   // If non-NULL we're running (inside Run()). Member is reference to value on
   // stack.
   RunState* run_state_;
 
   // Lock for accessing |run_state_|. In general the only method that we have to
   // worry about is ScheduleWork(). All other methods are invoked on the same
   // thread.
@@ skipping 20 matching lines @@
   ScopedMessagePipeHandle read_handle_;
   ScopedMessagePipeHandle write_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpMojo);
 };
 
 }  // namespace common
 }  // namespace mojo
 
 #endif  // MOJO_MESSAGE_PUMP_MESSAGE_PUMP_MOJO_H_