Make RunLoop remove handle when a timeout is notified

mojo/public/utility/run_loop_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "mojo/public/system/core_cpp.h"
 #include "mojo/public/tests/test_support.h"
@@ skipping 87 matching lines @@
   MessagePipe test_pipe;
   EXPECT_EQ(MOJO_RESULT_OK, test::WriteEmptyMessage(test_pipe.handle1.get()));
 
   RunLoop run_loop;
   handler.set_run_loop(&run_loop);
   run_loop.AddHandler(&handler, test_pipe.handle0.get(),
                       MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE);
   run_loop.Run();
   EXPECT_EQ(1, handler.ready_count());
   EXPECT_EQ(0, handler.error_count());
+  EXPECT_FALSE(run_loop.HasHandler(test_pipe.handle0.get()));
 }
 
 class QuitOnReadyRunLoopHandler : public TestRunLoopHandler {
  public:
   QuitOnReadyRunLoopHandler() : run_loop_(NULL) {
   }
   virtual ~QuitOnReadyRunLoopHandler() {}
 
   void set_run_loop(RunLoop* run_loop) { run_loop_ = run_loop; }
 
@@ skipping 15 matching lines @@
   MessagePipe test_pipe;
   EXPECT_EQ(MOJO_RESULT_OK, test::WriteEmptyMessage(test_pipe.handle1.get()));
 
   RunLoop run_loop;
   handler.set_run_loop(&run_loop);
   run_loop.AddHandler(&handler, test_pipe.handle0.get(),
                       MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE);
   run_loop.Run();
   EXPECT_EQ(1, handler.ready_count());
   EXPECT_EQ(0, handler.error_count());
+  EXPECT_TRUE(run_loop.HasHandler(test_pipe.handle0.get()));
 }
 
 class QuitOnErrorRunLoopHandler : public TestRunLoopHandler {
  public:
   QuitOnErrorRunLoopHandler() : run_loop_(NULL) {
   }
   virtual ~QuitOnErrorRunLoopHandler() {}
 
   void set_run_loop(RunLoop* run_loop) { run_loop_ = run_loop; }
 
@@ skipping 15 matching lines @@
   MessagePipe test_pipe;
   RunLoop run_loop;
   handler.set_run_loop(&run_loop);
   run_loop.AddHandler(&handler, test_pipe.handle0.get(),
                       MOJO_WAIT_FLAG_READABLE,
                       static_cast<MojoDeadline>(10000));
   run_loop.Run();
   EXPECT_EQ(0, handler.ready_count());
   EXPECT_EQ(1, handler.error_count());
   EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, handler.last_error_result());
+  EXPECT_FALSE(run_loop.HasHandler(test_pipe.handle0.get()));
 }
 
 TEST_F(RunLoopTest, Current) {
   EXPECT_TRUE(RunLoop::current() == NULL);
   {
     RunLoop run_loop;
     EXPECT_EQ(&run_loop, RunLoop::current());
   }
   EXPECT_TRUE(RunLoop::current() == NULL);
 }
 
 }  // namespace
 }  // namespace utility
 }  // namespace mojo