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

device/bluetooth/bluetooth_remote_gatt_characteristic_android.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 "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 25 matching lines @@
     jobject /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
   std::unique_ptr<BluetoothRemoteGattCharacteristicAndroid> characteristic(
       new BluetoothRemoteGattCharacteristicAndroid(adapter, service,
                                                    instance_id));
 
   JNIEnv* env = AttachCurrentThread();
   characteristic->j_characteristic_.Reset(
       Java_ChromeBluetoothRemoteGattCharacteristic_create(
           env, reinterpret_cast<intptr_t>(characteristic.get()),
           bluetooth_gatt_characteristic_wrapper,
-          base::android::ConvertUTF8ToJavaString(env, instance_id).obj(),
+          base::android::ConvertUTF8ToJavaString(env, instance_id),
           chrome_bluetooth_device));
 
   return characteristic;
 }
 
 BluetoothRemoteGattCharacteristicAndroid::
     ~BluetoothRemoteGattCharacteristicAndroid() {
   Java_ChromeBluetoothRemoteGattCharacteristic_onBluetoothRemoteGattCharacteristicAndroidDestruction(
-      AttachCurrentThread(), j_characteristic_.obj());
+      AttachCurrentThread(), j_characteristic_);
 
   if (pending_start_notify_calls_.size()) {
     OnStartNotifySessionError(
         device::BluetoothRemoteGattService::GATT_ERROR_FAILED);
   }
 }
 
 // static
 bool BluetoothRemoteGattCharacteristicAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(
       env);  // Generated in ChromeBluetoothRemoteGattCharacteristic_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothRemoteGattCharacteristicAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_characteristic_);
 }
 
 std::string BluetoothRemoteGattCharacteristicAndroid::GetIdentifier() const {
   return instance_id_;
 }
 
 BluetoothUUID BluetoothRemoteGattCharacteristicAndroid::GetUUID() const {
   return device::BluetoothUUID(ConvertJavaStringToUTF8(
       Java_ChromeBluetoothRemoteGattCharacteristic_getUUID(
-          AttachCurrentThread(), j_characteristic_.obj())));
+          AttachCurrentThread(), j_characteristic_)));
 }
 
 const std::vector<uint8_t>& BluetoothRemoteGattCharacteristicAndroid::GetValue()
     const {
   return value_;
 }
 
 BluetoothRemoteGattService*
 BluetoothRemoteGattCharacteristicAndroid::GetService() const {
   return service_;
 }
 
 BluetoothRemoteGattCharacteristic::Properties
 BluetoothRemoteGattCharacteristicAndroid::GetProperties() const {
   return Java_ChromeBluetoothRemoteGattCharacteristic_getProperties(
-      AttachCurrentThread(), j_characteristic_.obj());
+      AttachCurrentThread(), j_characteristic_);
 }
 
 BluetoothRemoteGattCharacteristic::Permissions
 BluetoothRemoteGattCharacteristicAndroid::GetPermissions() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 bool BluetoothRemoteGattCharacteristicAndroid::IsNotifying() const {
   NOTIMPLEMENTED();
@@ skipping 52 matching lines @@
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(error_callback,
                    (ccc_descriptor.size() == 0)
                        ? BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED
                        : BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_setCharacteristicNotification(
-          AttachCurrentThread(), j_characteristic_.obj(), true)) {
+          AttachCurrentThread(), j_characteristic_, true)) {
     LOG(ERROR) << "Error enabling characteristic notification";
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(error_callback,
                               BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   std::vector<uint8_t> value(2);
   value[0] = hasNotify ? 1 : 2;
 
@@ skipping 13 matching lines @@
     const ErrorCallback& error_callback) {
   if (read_pending_ || write_pending_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(error_callback,
                    BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
     return;
   }
 
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_readRemoteCharacteristic(
-          AttachCurrentThread(), j_characteristic_.obj())) {
+          AttachCurrentThread(), j_characteristic_)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(error_callback,
                               BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   read_pending_ = true;
   read_callback_ = callback;
   read_error_callback_ = error_callback;
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::WriteRemoteCharacteristic(
     const std::vector<uint8_t>& new_value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   if (read_pending_ || write_pending_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(error_callback,
                    BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
     return;
   }
 
   JNIEnv* env = AttachCurrentThread();
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_writeRemoteCharacteristic(
-          env, j_characteristic_.obj(),
-          base::android::ToJavaByteArray(env, new_value).obj())) {
+          env, j_characteristic_,
+          base::android::ToJavaByteArray(env, new_value))) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(error_callback,
                               BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   write_pending_ = true;
   write_callback_ = callback;
   write_error_callback_ = error_callback;
 }
@@ skipping 98 matching lines @@
         BluetoothRemoteGattServiceAndroid* service,
         const std::string& instance_id)
     : adapter_(adapter), service_(service), instance_id_(instance_id) {}
 
 void BluetoothRemoteGattCharacteristicAndroid::EnsureDescriptorsCreated()
     const {
   if (!descriptors_.empty())
     return;
 
   Java_ChromeBluetoothRemoteGattCharacteristic_createDescriptors(
-      AttachCurrentThread(), j_characteristic_.obj());
+      AttachCurrentThread(), j_characteristic_);
 }
 
 }  // namespace device