Fix content_browsertests on Android.

base/message_loop/message_pump_android.cc

 // Copyright (c) 2012 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 "base/message_loop/message_pump_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "jni/SystemMessageHandler_jni.h"
 
 using base::android::ScopedJavaLocalRef;
 
 // ----------------------------------------------------------------------------
 // Native JNI methods called by Java.
 // ----------------------------------------------------------------------------
 // This method can not move to anonymous namespace as it has been declared as
 // 'static' in system_message_handler_jni.h.
-static void DoRunLoopOnce(JNIEnv* env, jobject obj, jint native_delegate) {
+static void DoRunLoopOnce(
+    JNIEnv* env,
+    jobject obj,
+    jint native_delegate,
+    jint native_message_loop) {
+  base::MessageLoop* message_loop =
+      reinterpret_cast<base::MessageLoop*>(native_message_loop);
+  if (message_loop != base::MessageLoop::current())
+    return;
+
   base::MessagePump::Delegate* delegate =
       reinterpret_cast<base::MessagePump::Delegate*>(native_delegate);
   DCHECK(delegate);
   // This is based on MessagePumpForUI::DoRunLoop() from desktop.
   // Note however that our system queue is handled in the java side.
   // In desktop we inspect and process a single system message and then
   // we call DoWork() / DoDelayedWork().
   // On Android, the java message queue may contain messages for other handlers
   // that will be processed before calling here again.
   bool did_work = delegate->DoWork();
@@ skipping 39 matching lines @@
   // return true (it only returns false if the RunLoop has been Quit already).
   if (!run_loop_->BeforeRun())
     NOTREACHED();
 
   DCHECK(system_message_handler_obj_.is_null());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
   system_message_handler_obj_.Reset(
-      Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate)));
+      Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate),
+          reinterpret_cast<jint>(MessageLoop::current())));
 }
 
 void MessagePumpForUI::Quit() {
   if (!system_message_handler_obj_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     DCHECK(env);
 
     Java_SystemMessageHandler_removeTimer(env,
         system_message_handler_obj_.obj());
     system_message_handler_obj_.Reset();
@@ skipping 29 matching lines @@
   Java_SystemMessageHandler_setDelayedTimer(env,
       system_message_handler_obj_.obj(), millis);
 }
 
 // static
 bool MessagePumpForUI::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace base