Upstream misc changes for android.

base/message_pump_android.cc

Index: base/message_pump_android.cc
diff --git a/base/message_pump_android.cc b/base/message_pump_android.cc
index d9fdf9c3847756261c57edf24bddc8e07f1a5e34..7136eff62eeec3124c85b224eec65153c24a1d6b 100644
--- a/base/message_pump_android.cc
+++ b/base/message_pump_android.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "jni/system_message_handler_jni.h"
 
-using base::android::AutoJObject;
+using base::android::ScopedJavaReference;
 
 namespace {
 
@@ -81,13 +81,13 @@ void MessagePumpForUI::Start(Delegate* delegate) {
   DCHECK(env);
 
   jclass clazz = env->FindClass(kClassPathName);
-  DCHECK(!clazz);
+  DCHECK(clazz);
 
   jmethodID constructor = base::android::GetMethodID(env, clazz, "<init>",
                                                      "(I)V");
-  AutoJObject client = AutoJObject::FromLocalRef(
-      env, env->NewObject(clazz, constructor, delegate));
-  DCHECK(!client.obj());
+  ScopedJavaReference<jobject> client(env, env->NewObject(clazz, constructor,
+                                                          delegate));
+  DCHECK(client.obj());
 
   g_system_message_handler_obj = env->NewGlobalRef(client.obj());