Android: adds Get(Static)MethodIDOrNULL.

chrome/browser/history/android/sqlite_cursor.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 "chrome/browser/history/android/sqlite_cursor.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SQLiteCursor_jni.h"
 #include "sql/statement.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::HasClass;
-using base::android::HasMethod;
-using base::android::GetMethodID;
+using base::android::GetMethodIDOrNULL;

[Sami, 2012/10/01 15:46:00]

Looks like NULL is still upper case here.

[bulach, 2012/10/01 17:25:00]

Done.

 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 
 namespace {
 
 SQLiteCursor::JavaColumnType ToJavaColumnType(sql::ColType type) {
   switch (type) {
     case sql::COLUMN_TYPE_INTEGER:
       return SQLiteCursor::NUMERIC;
     case sql::COLUMN_TYPE_FLOAT:
@@ skipping 24 matching lines @@
     const std::vector<std::string>& column_names,
     history::AndroidStatement* statement,
     AndroidHistoryProviderService* service,
     FaviconService* favicon_service) {
   if (!HasClass(env, kSQLiteCursorClassPath)) {
     LOG(ERROR) << "Can not find " << kSQLiteCursorClassPath;
     return ScopedJavaLocalRef<jobject>();
   }
 
   ScopedJavaLocalRef<jclass> sclass = GetClass(env, kSQLiteCursorClassPath);
-  if (!HasMethod(env, sclass, "<init>", "(I)V")) {
+
+  jmethodID method_id = GetMethodIDOrNULL(env, sclass, "<init>", "(I)V");
+  if (!method_id) {

[joth, 2012/10/01 16:15:27]

can we comment why it's OK for this not to exist (i.e. we don't CHECK), yet we
do log an error.

THe class has existed since API level 1.0, so we shouldn't be hitting failures
here.

[bulach, 2012/10/01 17:25:00]

ugh, good point.. I think it's one of those "just in case" checks for
hand-written JNI.. using GetMethodID instead, but adding leandro to double
check..

     LOG(ERROR) << "Can not find " << kSQLiteCursorClassPath << " Constructor";
     return ScopedJavaLocalRef<jobject>();
   }
 
-  jmethodID method_id = GetMethodID(env, sclass, "<init>", "(I)V");
   SQLiteCursor* cursor = new SQLiteCursor(column_names, statement, service,
                                           favicon_service);
   ScopedJavaLocalRef<jobject> obj(env,
       env->NewObject(sclass.obj(), method_id, reinterpret_cast<jint>(cursor)));
   if (obj.is_null()) {
     delete cursor;
     return ScopedJavaLocalRef<jobject>();
   }
   return obj;
 }
@@ skipping 193 matching lines @@
     return SQLiteCursor::BLOB;
 
   return ToJavaColumnType(statement_->statement()->ColumnType(column));
 }
 
 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   service_->MoveStatement(statement_, position_, pos, &consumer_,
                 base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)));
 }