Remove now-unnecessary .obj() in Java method calls.

chrome/browser/android/shortcut_helper.cc

 // Copyright 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 "chrome/browser/android/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 109 matching lines @@
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   // The callback will need to be run after shortcut creation completes in order
   // to download the splash image and save it to the WebappDataStorage. Create a
   // copy of the callback here and send the pointer to Java, which will send it
   // back once the asynchronous shortcut creation process finishes.
   uintptr_t callback_pointer =
       reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
 
-  Java_ShortcutHelper_addWebapp(
-      env,
-      java_webapp_id.obj(),
-      java_url.obj(),
-      java_scope_url.obj(),
-      java_user_title.obj(),
-      java_name.obj(),
-      java_short_name.obj(),
-      java_icon_url.obj(),
-      java_bitmap.obj(),
-      info.display,
-      info.orientation,
-      info.source,
-      info.theme_color,
-      info.background_color,
-      callback_pointer);
+  Java_ShortcutHelper_addWebapp(env, java_webapp_id, java_url, java_scope_url,
+                                java_user_title, java_name, java_short_name,
+                                java_icon_url, java_bitmap, info.display,
+                                info.orientation, info.source, info.theme_color,
+                                info.background_color, callback_pointer);
 }
 
 void ShortcutHelper::AddShortcutWithSkBitmap(
     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
-  Java_ShortcutHelper_addShortcut(env, java_url.obj(), java_user_title.obj(),
-                                  java_bitmap.obj(), info.source);
+  Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
+                                  info.source);
 }
 
 void ShortcutHelper::OnBuiltWebApk(bool success) {
   if (success) {
     DVLOG(1) << "Sent request to install WebAPK. Seems to have worked.";
   } else {
     LOG(ERROR) << "WebAPK install failed.";
   }
   // TODO(pkotwicz): Figure out what to do when installing WebAPK fails.
   // (crbug.com/626950)
@@ skipping 44 matching lines @@
     const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
-  Java_ShortcutHelper_storeWebappSplashImage(
-      env,
-      java_webapp_id.obj(),
-      java_splash_image.obj());
+  Java_ShortcutHelper_storeWebappSplashImage(env, java_webapp_id,
+                                             java_splash_image);
 }
 
 // static
 SkBitmap ShortcutHelper::FinalizeLauncherIconInBackground(
     const SkBitmap& bitmap,
     const GURL& url,
     bool* is_generated) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> result;
   *is_generated = false;
 
   if (!bitmap.isNull()) {
     if (Java_ShortcutHelper_isIconLargeEnoughForLauncher(env, bitmap.width(),
                                                          bitmap.height())) {
       ScopedJavaLocalRef<jobject> java_bitmap =
           gfx::ConvertToJavaBitmap(&bitmap);
-      result = Java_ShortcutHelper_createHomeScreenIconFromWebIcon(
-          env, java_bitmap.obj());
+      result =
+          Java_ShortcutHelper_createHomeScreenIconFromWebIcon(env, java_bitmap);
     }
   }
 
   if (result.is_null()) {
     ScopedJavaLocalRef<jstring> java_url =
         base::android::ConvertUTF8ToJavaString(env, url.spec());
     SkColor mean_color = SkColorSetRGB(
         kDefaultRGBIconValue, kDefaultRGBIconValue, kDefaultRGBIconValue);
 
     if (!bitmap.isNull())
       mean_color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
 
     *is_generated = true;
     result = Java_ShortcutHelper_generateHomeScreenIcon(
-        env, java_url.obj(), SkColorGetR(mean_color), SkColorGetG(mean_color),
+        env, java_url, SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }
 
   return result.obj()
              ? gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj()))
              : SkBitmap();
 }
 
 // static
 bool ShortcutHelper::IsWebApkInstalled(const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
-  return Java_ShortcutHelper_isWebApkInstalled(env, java_url.obj());
+  return Java_ShortcutHelper_isWebApkInstalled(env, java_url);
 }
 
 GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
-      Java_ShortcutHelper_getScopeFromUrl(env, java_url.obj());
+      Java_ShortcutHelper_getScopeFromUrl(env, java_url);
   return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
 }
 
 // Callback used by Java when the shortcut has been created.
 // |splash_image_callback| is a pointer to a base::Closure allocated in
 // AddShortcutWithSkBitmap, so reinterpret_cast it back and run it.
 //
 // This callback should only ever be called when the shortcut was for a
 // webapp-capable site; otherwise, |splash_image_callback| will have never been
 // allocated and doesn't need to be run or deleted.
 void OnWebappDataStored(JNIEnv* env,
                         const JavaParamRef<jclass>& clazz,
                         jlong jsplash_image_callback) {
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }