Pass JavaRef to Java methods in android_webview.

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
@@ skipping 72 matching lines @@
                             new AwSettingsUserData(this));
 }
 
 AwSettings::~AwSettings() {
   if (web_contents()) {
     web_contents()->SetUserData(kAwSettingsUserDataKey, NULL);
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
-  jobject obj = scoped_obj.obj();
-  if (!obj) return;
-  Java_AwSettings_nativeAwSettingsGone(env, obj,
+  if (scoped_obj.is_null())
+    return;
+  Java_AwSettings_nativeAwSettingsGone(env, scoped_obj,
                                        reinterpret_cast<intptr_t>(this));
 }
 
 void AwSettings::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 AwSettings* AwSettings::FromWebContents(content::WebContents* web_contents) {
   return AwSettingsUserData::GetSettings(web_contents);
 }
 
 AwRenderViewHostExt* AwSettings::GetAwRenderViewHostExt() {
   if (!web_contents()) return NULL;
   AwContents* contents = AwContents::FromWebContents(web_contents());
   if (!contents) return NULL;
   return contents->render_view_host_ext();
 }
 
 void AwSettings::ResetScrollAndScaleState(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
   if (!rvhe) return;
   rvhe->ResetScrollAndScaleState();
 }
 
 void AwSettings::UpdateEverything() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
   ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
-  jobject obj = scoped_obj.obj();
-  if (!obj) return;
+  if (scoped_obj.is_null())
+    return;
   // Grab the lock and call UpdateEverythingLocked.
-  Java_AwSettings_updateEverything(env, obj);
+  Java_AwSettings_updateEverything(env, scoped_obj);
 }
 
 void AwSettings::UpdateEverythingLocked(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   UpdateInitialPageScaleLocked(env, obj);
   UpdateWebkitPreferencesLocked(env, obj);
   UpdateUserAgentLocked(env, obj);
   ResetScrollAndScaleState(env, obj);
   UpdateFormDataPreferencesLocked(env, obj);
   UpdateRendererPreferencesLocked(env, obj);
@@ skipping 114 matching lines @@
 }
 
 void AwSettings::WebContentsDestroyed() {
   delete this;
 }
 
 void AwSettings::PopulateWebPreferences(WebPreferences* web_prefs) {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
   ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
-  jobject obj = scoped_obj.obj();
-  if (!obj) return;
+  if (scoped_obj.is_null())
+    return;
   // Grab the lock and call PopulateWebPreferencesLocked.
-  Java_AwSettings_populateWebPreferences(
-      env, obj, reinterpret_cast<jlong>(web_prefs));
+  Java_AwSettings_populateWebPreferences(env, scoped_obj,
+                                         reinterpret_cast<jlong>(web_prefs));
 }
 
 void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
                                               const JavaParamRef<jobject>& obj,
                                               jlong web_prefs_ptr) {
   AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
   if (!render_view_host_ext) return;
 
   WebPreferences* web_prefs = reinterpret_cast<WebPreferences*>(web_prefs_ptr);
   PopulateFixedWebPreferences(web_prefs);
@@ skipping 180 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent());
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview