Remove calls to deprecated MessageLoop methods on Windows and Linux.

mojo/android/system/base_run_loop.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/android/system/base_run_loop.h"
 
 #include <jni.h>
 
 #include "base/android/base_jni_registrar.h"
 #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"
 
 using base::android::JavaParamRef;
 
 namespace mojo {
 namespace android {
 
 static jlong CreateBaseRunLoop(JNIEnv* env,
                                const JavaParamRef<jobject>& jcaller) {
   base::MessageLoop* message_loop =
       new base::MessageLoop(common::MessagePumpMojo::Create());
   return reinterpret_cast<uintptr_t>(message_loop);
 }
 
 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,
                  const JavaParamRef<jobject>& jcaller,
                  jlong runLoopID) {
   reinterpret_cast<base::MessageLoop*>(runLoopID)->QuitWhenIdle();
 }
 
 static void RunJavaRunnable(
     const base::android::ScopedJavaGlobalRef<jobject>& runnable_ref) {
   Java_BaseRunLoop_runRunnable(base::android::AttachCurrentThread(),
                                runnable_ref.obj());
 }
 
 static void PostDelayedTask(JNIEnv* env,
                             const JavaParamRef<jobject>& jcaller,
                             jlong runLoopID,
                             const JavaParamRef<jobject>& runnable,
                             jlong delay) {
   base::android::ScopedJavaGlobalRef<jobject> runnable_ref;
   // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to
   // 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,
                               const JavaParamRef<jobject>& jcaller,
                               jlong runLoopID) {
   base::MessageLoop* message_loop =
       reinterpret_cast<base::MessageLoop*>(runLoopID);
   delete message_loop;
 }
 
 bool RegisterBaseRunLoop(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo