| Index: ios/web/web_thread_impl.cc
|
| diff --git a/ios/web/web_thread_impl.cc b/ios/web/web_thread_impl.cc
|
| index 370295f259dca84215651729e5dc8d4c38e8f609..127e030291e769aa71aa5c6df35f5e55904e856a 100644
|
| --- a/ios/web/web_thread_impl.cc
|
| +++ b/ios/web/web_thread_impl.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/threading/thread_restrictions.h"
|
| @@ -168,66 +169,66 @@ void WebThreadImpl::Init() {
|
| }
|
| }
|
|
|
| -NOINLINE void WebThreadImpl::UIThreadRun(base::MessageLoop* message_loop) {
|
| +NOINLINE void WebThreadImpl::UIThreadRun(base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| -NOINLINE void WebThreadImpl::DBThreadRun(base::MessageLoop* message_loop) {
|
| +NOINLINE void WebThreadImpl::DBThreadRun(base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| -NOINLINE void WebThreadImpl::FileThreadRun(base::MessageLoop* message_loop) {
|
| +NOINLINE void WebThreadImpl::FileThreadRun(base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| NOINLINE void WebThreadImpl::FileUserBlockingThreadRun(
|
| - base::MessageLoop* message_loop) {
|
| + base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| -NOINLINE void WebThreadImpl::CacheThreadRun(base::MessageLoop* message_loop) {
|
| +NOINLINE void WebThreadImpl::CacheThreadRun(base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| -NOINLINE void WebThreadImpl::IOThreadRun(base::MessageLoop* message_loop) {
|
| +NOINLINE void WebThreadImpl::IOThreadRun(base::RunLoop* run_loop) {
|
| volatile int line_number = __LINE__;
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| CHECK_GT(line_number, 0);
|
| }
|
|
|
| -void WebThreadImpl::Run(base::MessageLoop* message_loop) {
|
| +void WebThreadImpl::Run(base::RunLoop* run_loop) {
|
| WebThread::ID thread_id = ID_COUNT;
|
| if (!GetCurrentThreadIdentifier(&thread_id))
|
| - return Thread::Run(message_loop);
|
| + return Thread::Run(run_loop);
|
|
|
| switch (thread_id) {
|
| case WebThread::UI:
|
| - return UIThreadRun(message_loop);
|
| + return UIThreadRun(run_loop);
|
| case WebThread::DB:
|
| - return DBThreadRun(message_loop);
|
| + return DBThreadRun(run_loop);
|
| case WebThread::FILE:
|
| - return FileThreadRun(message_loop);
|
| + return FileThreadRun(run_loop);
|
| case WebThread::FILE_USER_BLOCKING:
|
| - return FileUserBlockingThreadRun(message_loop);
|
| + return FileUserBlockingThreadRun(run_loop);
|
| case WebThread::CACHE:
|
| - return CacheThreadRun(message_loop);
|
| + return CacheThreadRun(run_loop);
|
| case WebThread::IO:
|
| - return IOThreadRun(message_loop);
|
| + return IOThreadRun(run_loop);
|
| case WebThread::ID_COUNT:
|
| CHECK(false); // This shouldn't actually be reached!
|
| break;
|
| }
|
| - Thread::Run(message_loop);
|
| + Thread::Run(run_loop);
|
| }
|
|
|
| void WebThreadImpl::CleanUp() {
|
|
|