Upstream misc changes for android.

base/message_pump_android.cc

 // Copyright (c) 2011 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_pump_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "jni/system_message_handler_jni.h"
 
-using base::android::AutoJObject;
+using base::android::ScopedJavaReference;
 
 namespace {
 
 const char* kClassPathName = "com/android/chromeview/base/SystemMessageHandler";
 
 jobject g_system_message_handler_obj = NULL;
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
@@ skipping 50 matching lines @@
 
 void MessagePumpForUI::Start(Delegate* delegate) {
   state_ = new MessageLoop::AutoRunState(MessageLoop::current());
 
   DCHECK(!g_system_message_handler_obj);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   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());
 
   base::android::CheckException(env);
 }
 
 void MessagePumpForUI::Quit() {
   if (g_system_message_handler_obj) {
     JNIEnv* env = base::android::AttachCurrentThread();
     DCHECK(env);
@@ skipping 37 matching lines @@
                                             millis);
   base::android::CheckException(env);
 }
 
 // Register native methods
 bool RegisterSystemMessageHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace base