| 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 "content/public/test/frame_load_waiter.h" | 5 #include "content/public/test/frame_load_waiter.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/thread_task_runner_handle.h" |
| 9 | 10 |
| 10 namespace content { | 11 namespace content { |
| 11 | 12 |
| 12 FrameLoadWaiter::FrameLoadWaiter(RenderFrame* frame) | 13 FrameLoadWaiter::FrameLoadWaiter(RenderFrame* frame) |
| 13 : RenderFrameObserver(frame) { | 14 : RenderFrameObserver(frame) { |
| 14 } | 15 } |
| 15 | 16 |
| 16 void FrameLoadWaiter::Wait() { | 17 void FrameLoadWaiter::Wait() { |
| 17 // Pump messages until Blink's threaded HTML parser finishes. | 18 // Pump messages until Blink's threaded HTML parser finishes. |
| 18 run_loop_.Run(); | 19 run_loop_.Run(); |
| 19 } | 20 } |
| 20 | 21 |
| 21 void FrameLoadWaiter::DidFinishLoad() { | 22 void FrameLoadWaiter::DidFinishLoad() { |
| 22 // Post a task to quit instead of quitting directly, since the load completion | 23 // Post a task to quit instead of quitting directly, since the load completion |
| 23 // may trigger other IPCs that tests are expecting. | 24 // may trigger other IPCs that tests are expecting. |
| 24 base::MessageLoop::current()->PostTask(FROM_HERE, run_loop_.QuitClosure()); | 25 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
| 26 run_loop_.QuitClosure()); |
| 25 } | 27 } |
| 26 | 28 |
| 27 } // namespace content | 29 } // namespace content |
| OLD | NEW |