Make RunLoop remove handle when a timeout is notified

mojo/public/utility/run_loop.cc

 // 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.
 
 #include "mojo/public/utility/run_loop.h"
 
 #include <assert.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 74 matching lines @@
       GetTimeTicksNow() + static_cast<MojoTimeTicks>(deadline);
   handler_data.id = next_handler_id_++;
   handler_data_[handle] = handler_data;
 }
 
 void RunLoop::RemoveHandler(const Handle& handle) {
   assert(current() == this);
   handler_data_.erase(handle);
 }
 
+bool RunLoop::HasHandler(const Handle& handle) const {
+  return handler_data_.find(handle) != handler_data_.end();
+}
+
 void RunLoop::Run() {
   assert(current() == this);
   // We don't currently support nesting.
   assert(!run_state_);
   RunState* old_state = run_state_;
   RunState run_state;
   run_state_ = &run_state;
   while (!run_state.should_quit)
     Wait();
   run_state_ = old_state;
@@ skipping 42 matching lines @@
   const HandleToHandlerData cloned_handlers(handler_data_);
   const MojoTimeTicks now(GetTimeTicksNow());
   for (HandleToHandlerData::const_iterator i = cloned_handlers.begin();
        i != cloned_handlers.end(); ++i) {
     // Since we're iterating over a clone of the handlers, verify the handler is
     // still valid before notifying.
     if (i->second.deadline != kInvalidTimeTicks &&
         i->second.deadline < now &&
         handler_data_.find(i->first) != handler_data_.end() &&
         handler_data_[i->first].id == i->second.id) {
+      handler_data_.erase(i->first);
       i->second.handler->OnHandleError(i->first, MOJO_RESULT_DEADLINE_EXCEEDED);
     }
   }
 }
 
 void RunLoop::RemoveFirstInvalidHandle(const WaitState& wait_state) {
   for (size_t i = 0; i < wait_state.handles.size(); ++i) {
     const MojoResult result =
         mojo::Wait(wait_state.handles[i], wait_state.wait_flags[i],
                    static_cast<MojoDeadline>(0));
@@ skipping 30 matching lines @@
     if (min_time < now)
       wait_state.deadline = static_cast<MojoDeadline>(0);
     else
       wait_state.deadline = static_cast<MojoDeadline>(min_time - now);
   }
   return wait_state;
 }
 
 }  // namespace utility
 }  // namespace mojo