Adding jobject null check before calling CalledByNative JNI functions

chrome/browser/android/tab_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 "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
@@ skipping 60 matching lines @@
 }
 
 TabAndroid::TabAndroid(JNIEnv* env, jobject obj)
     : weak_java_tab_(env, obj),
       synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) {
   Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 TabAndroid::~TabAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return;
-
-  Java_Tab_clearNativePtr(env, obj.obj());
+  Java_Tab_clearNativePtr(env, weak_java_tab_.get(env).obj());
 }
 
 base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return weak_java_tab_.get(env);
 }
 
 int TabAndroid::GetAndroidId() const {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return -1;
-  return Java_Tab_getId(env, obj.obj());
+  return Java_Tab_getId(env, weak_java_tab_.get(env).obj());
 }
 
 int TabAndroid::GetSyncId() const {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return 0;
-  return Java_Tab_getSyncId(env, obj.obj());
+  return Java_Tab_getSyncId(env, weak_java_tab_.get(env).obj());
 }
 
 base::string16 TabAndroid::GetTitle() const {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return base::string16();
   return base::android::ConvertJavaStringToUTF16(
-      Java_Tab_getTitle(env, obj.obj()));
+      Java_Tab_getTitle(env, weak_java_tab_.get(env).obj()));
 }
 
 GURL TabAndroid::GetURL() const {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return GURL::EmptyGURL();
   return GURL(base::android::ConvertJavaStringToUTF8(
-      Java_Tab_getUrl(env, obj.obj())));
+      Java_Tab_getUrl(env, weak_java_tab_.get(env).obj())));
 }
 
 bool TabAndroid::LoadIfNeeded() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return false;
-  return Java_Tab_loadIfNeeded(env, obj.obj());
+  return Java_Tab_loadIfNeeded(env, weak_java_tab_.get(env).obj());
 }
 
 content::ContentViewCore* TabAndroid::GetContentViewCore() const {
   if (!web_contents())
     return NULL;
 
   return content::ContentViewCore::FromWebContents(web_contents());
 }
 
 Profile* TabAndroid::GetProfile() const {
@@ skipping 13 matching lines @@
   if (!web_contents())
     return;
 
   SessionTabHelper* session_tab_helper =
           SessionTabHelper::FromWebContents(web_contents());
   session_tab_helper->SetWindowID(session_window_id_);
 }
 
 void TabAndroid::SetSyncId(int sync_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
-  if (obj.is_null())
-    return;
-  Java_Tab_setSyncId(env, obj.obj(), sync_id);
+  Java_Tab_setSyncId(env, weak_java_tab_.get(env).obj(), sync_id);
 }
 
 void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) {
   NOTIMPLEMENTED();
 }
 
 bool TabAndroid::ShouldWelcomePageLinkToTermsOfService() {
   NOTIMPLEMENTED();
   return false;
 }
@@ skipping 340 matching lines @@
 
 static void Init(JNIEnv* env, jobject obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }