Make ConvertJavaToUTF functions more robusts.

base/android/jni_string.cc

Index: base/android/jni_string.cc
diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
index c8a90ca9e1012c9d97ac0e822350081c6937fd35..26d3cf460e0666894b55de06284fb2df38258806 100644
--- a/base/android/jni_string.cc
+++ b/base/android/jni_string.cc
@@ -48,6 +48,10 @@ ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
 }
 
 string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str) {
+  if (!str) {
+    NOTREACHED() << " ConvertJavaStringToUTF16 called with null string.";

[bulach, 2012/09/13 10:02:55]

hmm, I'm not sure about the NOTREACHED here..

I think it'd be clearer either with an imperative CHECK:
CHECK(str) << "ConvertJavaStringToUTF16 called with null string.";

or a just a LOG:

if (!str) {
  LOG(WARNING) << " ConvertJavaStringToUTF16 called with null string.";
  return string16();
}

what do you think?

+    return string16();
+  }
   const jchar* chars = env->GetStringChars(str, NULL);
   DCHECK(chars);
   // GetStringChars isn't required to NULL-terminate the strings