| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "base/test/ios/wait_util.h" | 5 #import "base/test/ios/wait_util.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/scoped_nsobject.h" | 10 #include "base/mac/scoped_nsobject.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 return elapsed; | 41 return elapsed; |
| 42 } | 42 } |
| 43 | 43 |
| 44 void WaitUntilCondition(ConditionBlock condition, | 44 void WaitUntilCondition(ConditionBlock condition, |
| 45 bool run_message_loop, | 45 bool run_message_loop, |
| 46 TimeDelta timeout) { | 46 TimeDelta timeout) { |
| 47 TimeUntilCondition(nil, condition, run_message_loop, timeout); | 47 TimeUntilCondition(nil, condition, run_message_loop, timeout); |
| 48 } | 48 } |
| 49 | 49 |
| 50 void WaitUntilCondition(ConditionBlock condition) { | 50 void WaitUntilCondition(ConditionBlock condition) { |
| 51 WaitUntilCondition(condition, nullptr, TimeDelta()); | 51 WaitUntilCondition(condition, false, TimeDelta()); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void SpinRunLoopWithMaxDelay(TimeDelta max_delay) { | 54 void SpinRunLoopWithMaxDelay(TimeDelta max_delay) { |
| 55 scoped_nsobject<NSDate> beforeDate( | 55 scoped_nsobject<NSDate> beforeDate( |
| 56 [[NSDate alloc] initWithTimeIntervalSinceNow:max_delay.InSecondsF()]); | 56 [[NSDate alloc] initWithTimeIntervalSinceNow:max_delay.InSecondsF()]); |
| 57 [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode | 57 [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode |
| 58 beforeDate:beforeDate]; | 58 beforeDate:beforeDate]; |
| 59 } | 59 } |
| 60 | 60 |
| 61 void SpinRunLoopWithMinDelay(TimeDelta min_delay) { | 61 void SpinRunLoopWithMinDelay(TimeDelta min_delay) { |
| 62 ElapsedTimer timer; | 62 ElapsedTimer timer; |
| 63 while (timer.Elapsed() < min_delay) { | 63 while (timer.Elapsed() < min_delay) { |
| 64 SpinRunLoopWithMaxDelay(TimeDelta::FromMilliseconds(10)); | 64 SpinRunLoopWithMaxDelay(TimeDelta::FromMilliseconds(10)); |
| 65 } | 65 } |
| 66 } | 66 } |
| 67 | 67 |
| 68 TimeDelta TimeUntilCondition(ProceduralBlock action, | |
| 69 ConditionBlock condition, | |
| 70 MessageLoop* message_loop, | |
| 71 TimeDelta timeout) { | |
| 72 return TimeUntilCondition(action, condition, message_loop != nullptr, | |
| 73 timeout); | |
| 74 } | |
| 75 | |
| 76 void WaitUntilCondition(ConditionBlock condition, | |
| 77 MessageLoop* message_loop, | |
| 78 TimeDelta timeout) { | |
| 79 WaitUntilCondition(condition, message_loop != nullptr, timeout); | |
| 80 } | |
| 81 | |
| 82 } // namespace ios | 68 } // namespace ios |
| 83 } // namespace test | 69 } // namespace test |
| 84 } // namespace base | 70 } // namespace base |
| OLD | NEW |