| Index: mojo/android/system/base_run_loop.cc
|
| diff --git a/mojo/android/system/base_run_loop.cc b/mojo/android/system/base_run_loop.cc
|
| index b2276dde06db01012801753b1e3cf075aeb660b9..2b26e73dcdef9c445dddf9bba7961c9d10b9112a 100644
|
| --- a/mojo/android/system/base_run_loop.cc
|
| +++ b/mojo/android/system/base_run_loop.cc
|
| @@ -10,7 +10,10 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| #include "base/bind.h"
|
| +#include "base/logging.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "jni/BaseRunLoop_jni.h"
|
| #include "mojo/message_pump/message_pump_mojo.h"
|
|
|
| @@ -29,13 +32,19 @@ static jlong CreateBaseRunLoop(JNIEnv* env,
|
| static void Run(JNIEnv* env,
|
| const JavaParamRef<jobject>& jcaller,
|
| jlong runLoopID) {
|
| - reinterpret_cast<base::MessageLoop*>(runLoopID)->Run();
|
| + DCHECK(reinterpret_cast<base::MessageLoop*>(runLoopID)
|
| + ->task_runner()
|
| + ->BelongsToCurrentThread());
|
| + base::RunLoop().Run();
|
| }
|
|
|
| static void RunUntilIdle(JNIEnv* env,
|
| const JavaParamRef<jobject>& jcaller,
|
| jlong runLoopID) {
|
| - reinterpret_cast<base::MessageLoop*>(runLoopID)->RunUntilIdle();
|
| + DCHECK(reinterpret_cast<base::MessageLoop*>(runLoopID)
|
| + ->task_runner()
|
| + ->BelongsToCurrentThread());
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| static void Quit(JNIEnv* env,
|
| @@ -60,9 +69,10 @@ static void PostDelayedTask(JNIEnv* env,
|
| // use it across threads. |RunJavaRunnable| will acquire a new JNIEnv before
|
| // running the Runnable.
|
| runnable_ref.Reset(env, runnable);
|
| - reinterpret_cast<base::MessageLoop*>(runLoopID)->PostDelayedTask(
|
| - FROM_HERE, base::Bind(&RunJavaRunnable, runnable_ref),
|
| - base::TimeDelta::FromMicroseconds(delay));
|
| + reinterpret_cast<base::MessageLoop*>(runLoopID)
|
| + ->task_runner()
|
| + ->PostDelayedTask(FROM_HERE, base::Bind(&RunJavaRunnable, runnable_ref),
|
| + base::TimeDelta::FromMicroseconds(delay));
|
| }
|
|
|
| static void DeleteMessageLoop(JNIEnv* env,
|
|
|