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

chrome/browser/android/offline_pages/offline_page_bridge.cc

 // Copyright 2015 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/offline_pages/offline_page_bridge.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 32 matching lines @@
 
 const char kOfflinePageBridgeKey[] = "offline-page-bridge";
 const bool kUserRequested = true;
 
 void ToJavaOfflinePageList(JNIEnv* env,
                            jobject j_result_obj,
                            const std::vector<OfflinePageItem>& offline_pages) {
   for (const OfflinePageItem& offline_page : offline_pages) {
     Java_OfflinePageBridge_createOfflinePageAndAddToList(
         env, j_result_obj,
-        ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
+        ConvertUTF8ToJavaString(env, offline_page.url.spec()),
         offline_page.offline_id,
-        ConvertUTF8ToJavaString(env, offline_page.client_id.name_space).obj(),
-        ConvertUTF8ToJavaString(env, offline_page.client_id.id).obj(),
-        ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
-        ConvertUTF8ToJavaString(env, offline_page.file_path.value()).obj(),
+        ConvertUTF8ToJavaString(env, offline_page.client_id.name_space),
+        ConvertUTF8ToJavaString(env, offline_page.client_id.id),
+        ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()),
+        ConvertUTF8ToJavaString(env, offline_page.file_path.value()),
         offline_page.file_size, offline_page.creation_time.ToJavaTime(),
         offline_page.access_count, offline_page.last_access_time.ToJavaTime());
   }
 }
 
 ScopedJavaLocalRef<jobject> ToJavaOfflinePageItem(
     JNIEnv* env,
     const OfflinePageItem& offline_page) {
   return Java_OfflinePageBridge_createOfflinePageItem(
-      env, ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
+      env, ConvertUTF8ToJavaString(env, offline_page.url.spec()),
       offline_page.offline_id,
-      ConvertUTF8ToJavaString(env, offline_page.client_id.name_space).obj(),
-      ConvertUTF8ToJavaString(env, offline_page.client_id.id).obj(),
-      ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
-      ConvertUTF8ToJavaString(env, offline_page.file_path.value()).obj(),
+      ConvertUTF8ToJavaString(env, offline_page.client_id.name_space),
+      ConvertUTF8ToJavaString(env, offline_page.client_id.id),
+      ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()),
+      ConvertUTF8ToJavaString(env, offline_page.file_path.value()),
       offline_page.file_size, offline_page.creation_time.ToJavaTime(),
       offline_page.access_count, offline_page.last_access_time.ToJavaTime());
 }
 
 void CheckPagesExistOfflineCallback(
     const ScopedJavaGlobalRef<jobject>& j_callback_obj,
     const OfflinePageModel::CheckPagesExistOfflineResult& offline_pages) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   std::vector<std::string> offline_pages_vector;
   for (const GURL& page : offline_pages)
     offline_pages_vector.push_back(page.spec());
 
   ScopedJavaLocalRef<jobjectArray> j_result_array =
       base::android::ToJavaArrayOfStrings(env, offline_pages_vector);
   DCHECK(j_result_array.obj());
 
-  Java_CheckPagesExistOfflineCallbackInternal_onResult(
-      env, j_callback_obj.obj(), j_result_array.obj());
+  Java_CheckPagesExistOfflineCallbackInternal_onResult(env, j_callback_obj,
+                                                       j_result_array);
 }
 
 void GetAllPagesCallback(
     const ScopedJavaGlobalRef<jobject>& j_result_obj,
     const ScopedJavaGlobalRef<jobject>& j_callback_obj,
     const OfflinePageModel::MultipleOfflinePageItemResult& result) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ToJavaOfflinePageList(env, j_result_obj.obj(), result);
   base::android::RunCallbackAndroid(j_callback_obj, j_result_obj);
 }
 
 void HasPagesCallback(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
                       bool result) {
   base::android::RunCallbackAndroid(j_callback_obj, result);
 }
 
 void SavePageCallback(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
                       const GURL& url,
                       OfflinePageModel::SavePageResult result,
                       int64_t offline_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_SavePageCallback_onSavePageDone(
-      env, j_callback_obj.obj(), static_cast<int>(result),
-      ConvertUTF8ToJavaString(env, url.spec()).obj(), offline_id);
+      env, j_callback_obj, static_cast<int>(result),
+      ConvertUTF8ToJavaString(env, url.spec()), offline_id);
 }
 
 void DeletePageCallback(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
                         OfflinePageModel::DeletePageResult result) {
   base::android::RunCallbackAndroid(j_callback_obj, static_cast<int>(result));
 }
 
 void SingleOfflinePageItemCallback(
     const ScopedJavaGlobalRef<jobject>& j_callback_obj,
     const OfflinePageItem* result) {
@@ skipping 73 matching lines @@
   java_ref_.Reset(j_offline_page_bridge);
 
   NotifyIfDoneLoading();
   offline_page_model_->AddObserver(this);
 }
 
 OfflinePageBridge::~OfflinePageBridge() {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // Native shutdown causes the destruction of |this|.
-  Java_OfflinePageBridge_offlinePageBridgeDestroyed(env, java_ref_.obj());
+  Java_OfflinePageBridge_offlinePageBridgeDestroyed(env, java_ref_);
 }
 
 void OfflinePageBridge::OfflinePageModelLoaded(OfflinePageModel* model) {
   DCHECK_EQ(offline_page_model_, model);
   NotifyIfDoneLoading();
 }
 
 void OfflinePageBridge::OfflinePageModelChanged(OfflinePageModel* model) {
   DCHECK_EQ(offline_page_model_, model);
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_OfflinePageBridge_offlinePageModelChanged(env, java_ref_.obj());
+  Java_OfflinePageBridge_offlinePageModelChanged(env, java_ref_);
 }
 
 void OfflinePageBridge::OfflinePageDeleted(int64_t offline_id,
                                            const ClientId& client_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_OfflinePageBridge_offlinePageDeleted(
-      env, java_ref_.obj(), offline_id, CreateClientId(env, client_id).obj());
+  Java_OfflinePageBridge_offlinePageDeleted(env, java_ref_, offline_id,
+                                            CreateClientId(env, client_id));
 }
 
 void OfflinePageBridge::HasPages(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jstring>& j_namespace,
                                  const JavaParamRef<jobject>& j_callback_obj) {
   std::string name_space = ConvertJavaStringToUTF8(env, j_namespace);
 
   ScopedJavaGlobalRef<jobject> j_callback_ref;
   j_callback_ref.Reset(env, j_callback_obj);
@@ skipping 172 matching lines @@
 void OfflinePageBridge::CheckMetadataConsistency(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   offline_page_model_->CheckMetadataConsistency();
 }
 
 void OfflinePageBridge::NotifyIfDoneLoading() const {
   if (!offline_page_model_->is_loaded())
     return;
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_OfflinePageBridge_offlinePageModelLoaded(env, java_ref_.obj());
+  Java_OfflinePageBridge_offlinePageModelLoaded(env, java_ref_);
 }
 
 
 ScopedJavaLocalRef<jobject> OfflinePageBridge::CreateClientId(
     JNIEnv* env,
     const ClientId& client_id) const {
   return Java_OfflinePageBridge_createClientId(
-      env,
-      ConvertUTF8ToJavaString(env, client_id.name_space).obj(),
-      ConvertUTF8ToJavaString(env, client_id.id).obj());
+      env, ConvertUTF8ToJavaString(env, client_id.name_space),
+      ConvertUTF8ToJavaString(env, client_id.id));
 }
 
 bool RegisterOfflinePageBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace offline_pages