Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/test_tools/simulator/simulator.h

 // Copyright (c) 2012 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 NET_QUIC_TEST_TOOLS_SIMULATOR_SIMULATOR_H_
 #define NET_QUIC_TEST_TOOLS_SIMULATOR_SIMULATOR_H_
 
 #include <map>
 #include <unordered_map>
 #include <unordered_set>
@@ skipping 117 matching lines @@
   // For each actor, maintain the time it is scheduled at.  The value for
   // unscheduled actors is QuicTime::Infinite().
   std::unordered_map<Actor*, QuicTime> scheduled_times_;
   std::unordered_set<std::string> actor_names_;
 
   DISALLOW_COPY_AND_ASSIGN(Simulator);
 };
 
 template <class TerminationPredicate>
 bool Simulator::RunUntil(TerminationPredicate termination_predicate) {
-  while (!schedule_.empty()) {
-    if (termination_predicate()) {
-      return true;
+  bool predicate_value = false;
+  while (true) {
+    predicate_value = termination_predicate();
+    if (predicate_value || schedule_.empty()) {
+      break;
     }
     HandleNextScheduledActor();
   }
-  return false;
+  return predicate_value;
 }
 
 template <class TerminationPredicate>
 bool Simulator::RunUntilOrTimeout(TerminationPredicate termination_predicate,
                                   QuicTime::Delta timeout) {
   QuicTime end_time = clock_.Now() + timeout;
   bool return_value = RunUntil([end_time, &termination_predicate, this]() {
     return termination_predicate() || clock_.Now() >= end_time;
   });
 
   if (clock_.Now() >= end_time) {
     return false;
   }
   return return_value;
 }
 
 }  // namespace simulator
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_SIMULATOR_SIMULATOR_H_