Pass JavaRef to WebContents::FromJavaWebContents.

chrome/browser/android/tab_android.cc

 // Copyright 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 <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 81 matching lines @@
 #include "ui/base/window_open_disposition.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
+using base::android::JavaRef;
 using content::BrowserThread;
 using content::GlobalRequestID;
 using content::NavigationController;
 using content::WebContents;
 using navigation_interception::InterceptNavigationDelegate;
 using navigation_interception::NavigationParams;
 
 TabAndroid* TabAndroid::FromWebContents(
   const content::WebContents* web_contents) {
   const CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(
       web_contents);
   if (!core_tab_helper)
     return NULL;
 
   CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
   if (!core_delegate)
     return NULL;
 
   return static_cast<TabAndroid*>(core_delegate);
 }
 
-TabAndroid* TabAndroid::GetNativeTab(JNIEnv* env, jobject obj) {
+TabAndroid* TabAndroid::GetNativeTab(JNIEnv* env, const JavaRef<jobject>& obj) {
   return reinterpret_cast<TabAndroid*>(Java_Tab_getNativePtr(env, obj));
 }
 
 void TabAndroid::AttachTabHelpers(content::WebContents* web_contents) {
   DCHECK(web_contents);
 
   TabHelpers::AttachTabHelpers(web_contents);
 }
 
-TabAndroid::TabAndroid(JNIEnv* env, jobject obj)
+TabAndroid::TabAndroid(JNIEnv* env, const JavaRef<jobject>& obj)
     : weak_java_tab_(env, obj),
       content_layer_(cc::Layer::Create()),
       tab_content_manager_(NULL),
       synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) {
   Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 TabAndroid::~TabAndroid() {
   GetContentLayer()->RemoveAllChildren();
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 217 matching lines @@
   delete this;
 }
 
 void TabAndroid::InitWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jboolean incognito,
     const JavaParamRef<jobject>& jweb_contents,
     const JavaParamRef<jobject>& jweb_contents_delegate,
     const JavaParamRef<jobject>& jcontext_menu_populator) {
-  web_contents_.reset(
-      content::WebContents::FromJavaWebContents(jweb_contents.obj()));
+  web_contents_.reset(content::WebContents::FromJavaWebContents(jweb_contents));
   DCHECK(web_contents_.get());
 
   AttachTabHelpers(web_contents_.get());
 
   SetWindowSessionID(session_window_id_.id());
 
   session_tab_id_.set_id(
       SessionTabHelper::FromWebContents(web_contents())->session_id().id());
   ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
       jcontext_menu_populator);
@@ skipping 501 matching lines @@
   if (tab_content_manager_)
     tab_content_manager_->AttachLiveLayer(GetAndroidId(), GetContentLayer());
 }
 
 void TabAndroid::AttachOverlayWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jweb_contents,
     jboolean visible) {
   WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(jweb_contents.obj());
+      content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
   DCHECK(web_contents->GetNativeView());
 
   web_contents->GetNativeView()->GetLayer()->SetHideLayerAndSubtree(!visible);
   content_layer_->AddChild(web_contents->GetNativeView()->GetLayer());
 }
 
 void TabAndroid::DetachOverlayWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jweb_contents) {
   WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(jweb_contents.obj());
+      content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
   DCHECK(web_contents->GetNativeView());
 
   if (web_contents->GetNativeView()->GetLayer()->parent() == content_layer_)
     web_contents->GetNativeView()->GetLayer()->RemoveFromParent();
 }
 
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }