Pass JavaRef to WebContents::FromJavaWebContents.

chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc

 // Copyright 2014 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/ui/android/tab_model/tab_model_jni_bridge.h"
 
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 70 matching lines @@
 int TabModelJniBridge::GetActiveIndex() const {
   JNIEnv* env = AttachCurrentThread();
   return Java_TabModelJniBridge_index(env, java_object_.get(env));
 }
 
 void TabModelJniBridge::CreateTab(TabAndroid* parent,
                                   WebContents* web_contents,
                                   int parent_tab_id) {
   JNIEnv* env = AttachCurrentThread();
   Java_TabModelJniBridge_createTabWithWebContents(
-      env, java_object_.get(env).obj(),
-      (parent ? parent->GetJavaObject().obj() : nullptr),
+      env, java_object_.get(env), (parent ? parent->GetJavaObject() : nullptr),
       web_contents->GetBrowserContext()->IsOffTheRecord(),
       web_contents->GetJavaWebContents(), parent_tab_id);
 }
 
 WebContents* TabModelJniBridge::GetWebContentsAt(int index) const {
   TabAndroid* tab = GetTabAt(index);
   return tab == NULL ? NULL : tab->web_contents();
 }
 
 TabAndroid* TabModelJniBridge::GetTabAt(int index) const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jtab =
       Java_TabModelJniBridge_getTabAt(env, java_object_.get(env), index);
 
-  return jtab.is_null() ?
-      NULL : TabAndroid::GetNativeTab(env, jtab.obj());
+  return jtab.is_null() ? NULL : TabAndroid::GetNativeTab(env, jtab);
 }
 
 void TabModelJniBridge::SetActiveIndex(int index) {
   JNIEnv* env = AttachCurrentThread();
   Java_TabModelJniBridge_setIndex(env, java_object_.get(env), index);
 }
 
 void TabModelJniBridge::CloseTabAt(int index) {
   JNIEnv* env = AttachCurrentThread();
   Java_TabModelJniBridge_closeTabAt(env, java_object_.get(env), index);
 }
 
 WebContents* TabModelJniBridge::CreateNewTabForDevTools(
     const GURL& url) {
   // TODO(dfalcantara): Change the Java side so that it creates and returns the
   //                    WebContents, which we can load the URL on and return.
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl = ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jobject> obj =
       Java_TabModelJniBridge_createNewTabForDevTools(env, java_object_.get(env),
                                                      jurl);
   if (obj.is_null()) {
     VLOG(0) << "Failed to create java tab";
     return NULL;
   }
-  TabAndroid* tab = TabAndroid::GetNativeTab(env, obj.obj());
+  TabAndroid* tab = TabAndroid::GetNativeTab(env, obj);
   if (!tab) {
     VLOG(0) << "Failed to create java tab";
     return NULL;
   }
   return tab->web_contents();
 }
 
 bool TabModelJniBridge::IsSessionRestoreInProgress() const {
   JNIEnv* env = AttachCurrentThread();
   return Java_TabModelJniBridge_isSessionRestoreInProgress(
@@ skipping 69 matching lines @@
 bool TabModelJniBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   jboolean is_incognito) {
   TabModel* tab_model = new TabModelJniBridge(env, obj, is_incognito);
   return reinterpret_cast<intptr_t>(tab_model);
 }