| 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 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/cancelable_callback.h" | 7 #include "base/cancelable_callback.h" |
| 8 #include "base/format_macros.h" | 8 #include "base/format_macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 TestOrderablePendingTask a2 = a; | 49 TestOrderablePendingTask a2 = a; |
| 50 EXPECT_EQ(a, a2); | 50 EXPECT_EQ(a, a2); |
| 51 EXPECT_LT(a2, b); | 51 EXPECT_LT(a2, b); |
| 52 EXPECT_LT(b, c); | 52 EXPECT_LT(b, c); |
| 53 EXPECT_LT(a2, c); | 53 EXPECT_LT(a2, c); |
| 54 } | 54 } |
| 55 | 55 |
| 56 class OrderedSimpleTaskRunnerTest : public testing::Test { | 56 class OrderedSimpleTaskRunnerTest : public testing::Test { |
| 57 public: | 57 public: |
| 58 OrderedSimpleTaskRunnerTest() | 58 OrderedSimpleTaskRunnerTest() |
| 59 : now_src_(TestNowSource::Create(base::TimeTicks())) { | 59 : now_src_(new base::SimpleTestTickClock(base::TimeTicks())) { |
| 60 task_runner_ = new OrderedSimpleTaskRunner(now_src_, true); | 60 task_runner_ = new OrderedSimpleTaskRunner(now_src_, true); |
| 61 } | 61 } |
| 62 ~OrderedSimpleTaskRunnerTest() override {} | 62 ~OrderedSimpleTaskRunnerTest() override {} |
| 63 | 63 |
| 64 protected: | 64 protected: |
| 65 std::string executed_tasks_; | 65 std::string executed_tasks_; |
| 66 scoped_refptr<TestNowSource> now_src_; | 66 base::SimpleTestTickClock* now_src_; |
| 67 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; | 67 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; |
| 68 | 68 |
| 69 void PostTask(int task_num, base::TimeDelta delay) { | 69 void PostTask(int task_num, base::TimeDelta delay) { |
| 70 base::Closure test_task = base::Bind(&OrderedSimpleTaskRunnerTest::Task, | 70 base::Closure test_task = base::Bind(&OrderedSimpleTaskRunnerTest::Task, |
| 71 base::Unretained(this), | 71 base::Unretained(this), |
| 72 task_num); | 72 task_num); |
| 73 task_runner_->PostDelayedTask(FROM_HERE, test_task, delay); | 73 task_runner_->PostDelayedTask(FROM_HERE, test_task, delay); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void PostTaskWhichPostsInstantTask(int task_num, base::TimeDelta delay) { | 76 void PostTaskWhichPostsInstantTask(int task_num, base::TimeDelta delay) { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 107 task_num, | 107 task_num, |
| 108 delay); | 108 delay); |
| 109 task_runner_->PostDelayedTask(FROM_HERE, test_task, delay); | 109 task_runner_->PostDelayedTask(FROM_HERE, test_task, delay); |
| 110 } | 110 } |
| 111 | 111 |
| 112 private: | 112 private: |
| 113 void Task(int task_num) { | 113 void Task(int task_num) { |
| 114 if (!executed_tasks_.empty()) | 114 if (!executed_tasks_.empty()) |
| 115 executed_tasks_ += " "; | 115 executed_tasks_ += " "; |
| 116 executed_tasks_ += | 116 executed_tasks_ += |
| 117 base::StringPrintf("%d(%" PRId64 "ms)", | 117 base::StringPrintf("%d(%" PRId64 "ms)", task_num, |
| 118 task_num, | 118 now_src_->NowTicks().ToInternalValue() / |
| 119 now_src_->Now().ToInternalValue() / | |
| 120 base::Time::kMicrosecondsPerMillisecond); | 119 base::Time::kMicrosecondsPerMillisecond); |
| 121 } | 120 } |
| 122 | 121 |
| 123 void TaskWhichPostsInstantTask(int task_num) { | 122 void TaskWhichPostsInstantTask(int task_num) { |
| 124 Task(task_num); | 123 Task(task_num); |
| 125 PostTask(-task_num, base::TimeDelta()); | 124 PostTask(-task_num, base::TimeDelta()); |
| 126 } | 125 } |
| 127 | 126 |
| 128 void TaskWhichPostsDelayedTask(int task_num, base::TimeDelta delay) { | 127 void TaskWhichPostsDelayedTask(int task_num, base::TimeDelta delay) { |
| 129 Task(task_num); | 128 Task(task_num); |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 task_runner_->SetAutoAdvanceNowToPendingTasks(false); | 268 task_runner_->SetAutoAdvanceNowToPendingTasks(false); |
| 270 PostTask(1, base::TimeDelta()); | 269 PostTask(1, base::TimeDelta()); |
| 271 PostTask(2, base::TimeDelta::FromMilliseconds(15)); | 270 PostTask(2, base::TimeDelta::FromMilliseconds(15)); |
| 272 PostTask(3, base::TimeDelta()); | 271 PostTask(3, base::TimeDelta()); |
| 273 PostTask(4, base::TimeDelta::FromMilliseconds(8)); | 272 PostTask(4, base::TimeDelta::FromMilliseconds(8)); |
| 274 | 273 |
| 275 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunPendingTasks(), "1(0ms) 3(0ms)"); | 274 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunPendingTasks(), "1(0ms) 3(0ms)"); |
| 276 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunPendingTasks(), ""); | 275 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunPendingTasks(), ""); |
| 277 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), | 276 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), |
| 278 base::TimeDelta::FromMilliseconds(8)); | 277 base::TimeDelta::FromMilliseconds(8)); |
| 279 now_src_->SetNow(base::TimeTicks::FromInternalValue(5000)); | 278 now_src_->Set(base::TimeTicks::FromInternalValue(5000)); |
| 280 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), | 279 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), |
| 281 base::TimeDelta::FromMilliseconds(3)); | 280 base::TimeDelta::FromMilliseconds(3)); |
| 282 now_src_->SetNow(base::TimeTicks::FromInternalValue(25000)); | 281 now_src_->Set(base::TimeTicks::FromInternalValue(25000)); |
| 283 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), base::TimeDelta()); | 282 EXPECT_EQ(task_runner_->DelayToNextTaskTime(), base::TimeDelta()); |
| 284 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), "4(25ms) 2(25ms)"); | 283 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), "4(25ms) 2(25ms)"); |
| 285 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), ""); | 284 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), ""); |
| 286 } | 285 } |
| 287 | 286 |
| 288 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilIdle) { | 287 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilIdle) { |
| 289 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); | 288 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); |
| 290 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), "1(0ms) -1(0ms)"); | 289 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), "1(0ms) -1(0ms)"); |
| 291 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), ""); | 290 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), ""); |
| 292 } | 291 } |
| 293 | 292 |
| 294 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeAutoNow) { | 293 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeAutoNow) { |
| 295 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); | 294 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); |
| 296 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); | 295 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); |
| 297 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); | 296 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); |
| 298 | 297 |
| 299 task_runner_->SetAutoAdvanceNowToPendingTasks(true); | 298 task_runner_->SetAutoAdvanceNowToPendingTasks(true); |
| 300 | 299 |
| 301 base::TimeTicks run_at = base::TimeTicks(); | 300 base::TimeTicks run_at = base::TimeTicks(); |
| 302 | 301 |
| 303 run_at += base::TimeDelta::FromMilliseconds(2); | 302 run_at += base::TimeDelta::FromMilliseconds(2); |
| 304 RUN_AND_CHECK_RESULT( | 303 RUN_AND_CHECK_RESULT( |
| 305 EXPECT_TRUE, RunUntilTime(run_at), "1(0ms) -1(0ms) 2(2ms) -2(2ms)"); | 304 EXPECT_TRUE, RunUntilTime(run_at), "1(0ms) -1(0ms) 2(2ms) -2(2ms)"); |
| 306 EXPECT_EQ(run_at, now_src_->Now()); | 305 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 307 | 306 |
| 308 run_at += base::TimeDelta::FromMilliseconds(1); | 307 run_at += base::TimeDelta::FromMilliseconds(1); |
| 309 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), "3(3ms) -3(3ms)"); | 308 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), "3(3ms) -3(3ms)"); |
| 310 EXPECT_EQ(run_at, now_src_->Now()); | 309 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 311 | 310 |
| 312 run_at += base::TimeDelta::FromMilliseconds(1); | 311 run_at += base::TimeDelta::FromMilliseconds(1); |
| 313 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), ""); | 312 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), ""); |
| 314 EXPECT_EQ(run_at, now_src_->Now()); | 313 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 315 } | 314 } |
| 316 | 315 |
| 317 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeManualNow) { | 316 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeManualNow) { |
| 318 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); | 317 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); |
| 319 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); | 318 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); |
| 320 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); | 319 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); |
| 321 | 320 |
| 322 task_runner_->SetAutoAdvanceNowToPendingTasks(false); | 321 task_runner_->SetAutoAdvanceNowToPendingTasks(false); |
| 323 | 322 |
| 324 base::TimeTicks run_at = base::TimeTicks(); | 323 base::TimeTicks run_at = base::TimeTicks(); |
| 325 | 324 |
| 326 run_at += base::TimeDelta::FromMilliseconds(2); | 325 run_at += base::TimeDelta::FromMilliseconds(2); |
| 327 RUN_AND_CHECK_RESULT( | 326 RUN_AND_CHECK_RESULT( |
| 328 EXPECT_TRUE, RunUntilTime(run_at), "1(2ms) 2(2ms) -1(2ms) -2(2ms)"); | 327 EXPECT_TRUE, RunUntilTime(run_at), "1(2ms) 2(2ms) -1(2ms) -2(2ms)"); |
| 329 EXPECT_EQ(run_at, now_src_->Now()); | 328 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 330 | 329 |
| 331 run_at += base::TimeDelta::FromMilliseconds(1); | 330 run_at += base::TimeDelta::FromMilliseconds(1); |
| 332 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), "3(3ms) -3(3ms)"); | 331 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), "3(3ms) -3(3ms)"); |
| 333 EXPECT_EQ(run_at, now_src_->Now()); | 332 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 334 | 333 |
| 335 run_at += base::TimeDelta::FromMilliseconds(1); | 334 run_at += base::TimeDelta::FromMilliseconds(1); |
| 336 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), ""); | 335 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_at), ""); |
| 337 EXPECT_EQ(run_at, now_src_->Now()); | 336 EXPECT_EQ(run_at, now_src_->NowTicks()); |
| 338 } | 337 } |
| 339 | 338 |
| 340 TEST_F(OrderedSimpleTaskRunnerTest, RunForPeriod) { | 339 TEST_F(OrderedSimpleTaskRunnerTest, RunForPeriod) { |
| 341 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); | 340 PostTaskWhichPostsInstantTask(1, base::TimeDelta()); |
| 342 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); | 341 PostTaskWhichPostsInstantTask(2, base::TimeDelta::FromMilliseconds(2)); |
| 343 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); | 342 PostTaskWhichPostsInstantTask(3, base::TimeDelta::FromMilliseconds(3)); |
| 344 | 343 |
| 345 RUN_AND_CHECK_RESULT(EXPECT_TRUE, | 344 RUN_AND_CHECK_RESULT(EXPECT_TRUE, |
| 346 RunForPeriod(base::TimeDelta::FromMilliseconds(2)), | 345 RunForPeriod(base::TimeDelta::FromMilliseconds(2)), |
| 347 "1(0ms) -1(0ms) 2(2ms) -2(2ms)"); | 346 "1(0ms) -1(0ms) 2(2ms) -2(2ms)"); |
| 348 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(2), | 347 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(2), |
| 349 now_src_->Now()); | 348 now_src_->NowTicks()); |
| 350 | 349 |
| 351 RUN_AND_CHECK_RESULT(EXPECT_FALSE, | 350 RUN_AND_CHECK_RESULT(EXPECT_FALSE, |
| 352 RunForPeriod(base::TimeDelta::FromMilliseconds(1)), | 351 RunForPeriod(base::TimeDelta::FromMilliseconds(1)), |
| 353 "3(3ms) -3(3ms)"); | 352 "3(3ms) -3(3ms)"); |
| 354 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3), | 353 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3), |
| 355 now_src_->Now()); | 354 now_src_->NowTicks()); |
| 356 | 355 |
| 357 RUN_AND_CHECK_RESULT( | 356 RUN_AND_CHECK_RESULT( |
| 358 EXPECT_FALSE, RunForPeriod(base::TimeDelta::FromMilliseconds(1)), ""); | 357 EXPECT_FALSE, RunForPeriod(base::TimeDelta::FromMilliseconds(1)), ""); |
| 359 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(4), | 358 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(4), |
| 360 now_src_->Now()); | 359 now_src_->NowTicks()); |
| 361 } | 360 } |
| 362 | 361 |
| 363 TEST_F(OrderedSimpleTaskRunnerTest, RunTasksWhileWithCallback) { | 362 TEST_F(OrderedSimpleTaskRunnerTest, RunTasksWhileWithCallback) { |
| 364 base::Callback<bool(void)> return_true = base::Bind(&ReturnTrue); | 363 base::Callback<bool(void)> return_true = base::Bind(&ReturnTrue); |
| 365 base::Callback<bool(void)> return_false = base::Bind(&ReturnFalse); | 364 base::Callback<bool(void)> return_false = base::Bind(&ReturnFalse); |
| 366 | 365 |
| 367 PostTask(1, base::TimeDelta()); | 366 PostTask(1, base::TimeDelta()); |
| 368 | 367 |
| 369 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunTasksWhile(return_false), ""); | 368 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunTasksWhile(return_false), ""); |
| 370 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunTasksWhile(return_true), "1(0ms)"); | 369 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunTasksWhile(return_true), "1(0ms)"); |
| 371 } | 370 } |
| 372 | 371 |
| 373 TEST_F(OrderedSimpleTaskRunnerTest, EmptyTaskList) { | 372 TEST_F(OrderedSimpleTaskRunnerTest, EmptyTaskList) { |
| 374 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), ""); | 373 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), ""); |
| 375 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), ""); | 374 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), ""); |
| 376 | 375 |
| 377 ASSERT_EQ(base::TimeTicks(), now_src_->Now()); | 376 ASSERT_EQ(base::TimeTicks(), now_src_->NowTicks()); |
| 378 | 377 |
| 379 RUN_AND_CHECK_RESULT( | 378 RUN_AND_CHECK_RESULT( |
| 380 EXPECT_FALSE, RunUntilTime(base::TimeTicks::FromInternalValue(100)), ""); | 379 EXPECT_FALSE, RunUntilTime(base::TimeTicks::FromInternalValue(100)), ""); |
| 381 EXPECT_EQ(base::TimeTicks::FromInternalValue(100), now_src_->Now()); | 380 EXPECT_EQ(base::TimeTicks::FromInternalValue(100), now_src_->NowTicks()); |
| 382 | 381 |
| 383 RUN_AND_CHECK_RESULT( | 382 RUN_AND_CHECK_RESULT( |
| 384 EXPECT_FALSE, RunForPeriod(base::TimeDelta::FromInternalValue(100)), ""); | 383 EXPECT_FALSE, RunForPeriod(base::TimeDelta::FromInternalValue(100)), ""); |
| 385 EXPECT_EQ(base::TimeTicks::FromInternalValue(200), now_src_->Now()); | 384 EXPECT_EQ(base::TimeTicks::FromInternalValue(200), now_src_->NowTicks()); |
| 386 | 385 |
| 387 base::Callback<bool(void)> return_true = base::Bind(&ReturnTrue); | 386 base::Callback<bool(void)> return_true = base::Bind(&ReturnTrue); |
| 388 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunTasksWhile(return_true), ""); | 387 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunTasksWhile(return_true), ""); |
| 389 } | 388 } |
| 390 | 389 |
| 391 TEST_F(OrderedSimpleTaskRunnerTest, RunPendingTasksTimeout) { | 390 TEST_F(OrderedSimpleTaskRunnerTest, RunPendingTasksTimeout) { |
| 392 PostTask(1, base::TimeDelta()); | 391 PostTask(1, base::TimeDelta()); |
| 393 PostTask(2, base::TimeDelta()); | 392 PostTask(2, base::TimeDelta()); |
| 394 PostTask(3, base::TimeDelta()); | 393 PostTask(3, base::TimeDelta()); |
| 395 PostTask(4, base::TimeDelta()); | 394 PostTask(4, base::TimeDelta()); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 421 | 420 |
| 422 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeout) { | 421 TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeout) { |
| 423 base::TimeTicks run_to = base::TimeTicks() + base::TimeDelta::FromSeconds(1); | 422 base::TimeTicks run_to = base::TimeTicks() + base::TimeDelta::FromSeconds(1); |
| 424 | 423 |
| 425 PostTask(1, base::TimeDelta::FromMilliseconds(1)); | 424 PostTask(1, base::TimeDelta::FromMilliseconds(1)); |
| 426 PostTask(2, base::TimeDelta::FromMilliseconds(2)); | 425 PostTask(2, base::TimeDelta::FromMilliseconds(2)); |
| 427 PostTask(3, base::TimeDelta::FromMilliseconds(3)); | 426 PostTask(3, base::TimeDelta::FromMilliseconds(3)); |
| 428 PostTask(4, base::TimeDelta::FromMilliseconds(4)); | 427 PostTask(4, base::TimeDelta::FromMilliseconds(4)); |
| 429 PostTask(5, base::TimeDelta::FromMilliseconds(5)); | 428 PostTask(5, base::TimeDelta::FromMilliseconds(5)); |
| 430 | 429 |
| 431 EXPECT_EQ(base::TimeTicks(), now_src_->Now()); | 430 EXPECT_EQ(base::TimeTicks(), now_src_->NowTicks()); |
| 432 task_runner_->SetRunTaskLimit(3); | 431 task_runner_->SetRunTaskLimit(3); |
| 433 RUN_AND_CHECK_RESULT( | 432 RUN_AND_CHECK_RESULT( |
| 434 EXPECT_TRUE, RunUntilTime(run_to), "1(1ms) 2(2ms) 3(3ms)"); | 433 EXPECT_TRUE, RunUntilTime(run_to), "1(1ms) 2(2ms) 3(3ms)"); |
| 435 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3), | 434 EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3), |
| 436 now_src_->Now()); | 435 now_src_->NowTicks()); |
| 437 | 436 |
| 438 task_runner_->SetRunTaskLimit(0); | 437 task_runner_->SetRunTaskLimit(0); |
| 439 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunUntilTime(run_to), ""); | 438 RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunUntilTime(run_to), ""); |
| 440 | 439 |
| 441 task_runner_->SetRunTaskLimit(100); | 440 task_runner_->SetRunTaskLimit(100); |
| 442 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_to), "4(4ms) 5(5ms)"); | 441 RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_to), "4(4ms) 5(5ms)"); |
| 443 EXPECT_EQ(run_to, now_src_->Now()); | 442 EXPECT_EQ(run_to, now_src_->NowTicks()); |
| 444 } | 443 } |
| 445 | 444 |
| 446 } // namespace cc | 445 } // namespace cc |
| OLD | NEW |