Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

mojo/edk/system/awakable_list.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/edk/system/awakable_list.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/awakable.h"
 #include "mojo/edk/system/handle_signals_state.h"
 
 namespace mojo {
 namespace system {
 
 AwakableList::AwakableList() {
 }
 
 AwakableList::~AwakableList() {
   DCHECK(awakables_.empty());
 }
 
 void AwakableList::AwakeForStateChange(const HandleSignalsState& state) {
-  for (AwakeInfoList::iterator it = awakables_.begin(); it != awakables_.end();
-       ++it) {
+  for (AwakeInfoList::iterator it = awakables_.begin();
+       it != awakables_.end();) {
+    bool keep = true;
     if (state.satisfies(it->signals))
-      it->awakable->Awake(MOJO_RESULT_OK, it->context);
+      keep = it->awakable->Awake(MOJO_RESULT_OK, it->context);
     else if (!state.can_satisfy(it->signals))
-      it->awakable->Awake(MOJO_RESULT_FAILED_PRECONDITION, it->context);
+      keep = it->awakable->Awake(MOJO_RESULT_FAILED_PRECONDITION, it->context);
+    AwakeInfoList::iterator maybe_delete = it;
+    ++it;
+
+    if (!keep)
+      awakables_.erase(maybe_delete);
   }
 }
 
 void AwakableList::CancelAll() {
   for (AwakeInfoList::iterator it = awakables_.begin(); it != awakables_.end();
        ++it) {
     it->awakable->Awake(MOJO_RESULT_CANCELLED, it->context);
   }
   awakables_.clear();
 }
@@ skipping 11 matching lines @@
        it != awakables_.end();) {
     AwakeInfoList::iterator maybe_delete = it;
     ++it;
     if (maybe_delete->awakable == awakable)
       awakables_.erase(maybe_delete);
   }
 }
 
 }  // namespace system
 }  // namespace mojo