Pass JavaRef to Java methods in device/bluetooth.

device/bluetooth/test/bluetooth_test_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/test/bluetooth_test_android.h"
 
 #include <iterator>
 #include <sstream>
 
 #include "base/android/jni_array.h"
@@ skipping 37 matching lines @@
   }
   EXPECT_EQ(0, gatt_open_connections_);
   BluetoothTestBase::TearDown();
 }
 
 bool BluetoothTestAndroid::PlatformSupportsLowEnergy() {
   return true;
 }
 
 void BluetoothTestAndroid::InitWithDefaultAdapter() {
-  adapter_ =
-      BluetoothAdapterAndroid::Create(
-          BluetoothAdapterWrapper_CreateWithDefaultAdapter().obj()).get();
+  adapter_ = BluetoothAdapterAndroid::Create(
+                 BluetoothAdapterWrapper_CreateWithDefaultAdapter())
+                 .get();
 }
 
 void BluetoothTestAndroid::InitWithoutDefaultAdapter() {
   adapter_ = BluetoothAdapterAndroid::Create(NULL).get();
 }
 
 void BluetoothTestAndroid::InitWithFakeAdapter() {
   j_fake_bluetooth_adapter_.Reset(Java_FakeBluetoothAdapter_create(
       AttachCurrentThread(), reinterpret_cast<intptr_t>(this)));
 
-  adapter_ =
-      BluetoothAdapterAndroid::Create(j_fake_bluetooth_adapter_.obj()).get();
+  adapter_ = BluetoothAdapterAndroid::Create(j_fake_bluetooth_adapter_).get();
 }
 
 bool BluetoothTestAndroid::DenyPermission() {
   Java_Fakes_setLocationServicesState(
       AttachCurrentThread(), false /* hasPermission */, true /* isEnabled */);
   return true;
 }
 
 BluetoothDevice* BluetoothTestAndroid::SimulateLowEnergyDevice(
     int device_ordinal) {
@@ skipping 65 matching lines @@
     device_android = static_cast<BluetoothDeviceAndroid*>(device);
   }
 
   // Join UUID strings into a single string.
   std::ostringstream uuids_space_delimited;
   std::copy(uuids.begin(), uuids.end(),
             std::ostream_iterator<std::string>(uuids_space_delimited, " "));
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_FakeBluetoothDevice_servicesDiscovered(
-      env, device_android ? device_android->GetJavaObject().obj() : nullptr,
+      env, device_android ? device_android->GetJavaObject() : nullptr,
       0,  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       base::android::ConvertUTF8ToJavaString(env, uuids_space_delimited.str()));
 }
 
 void BluetoothTestAndroid::SimulateGattServicesDiscoveryError(
     BluetoothDevice* device) {
   BluetoothDeviceAndroid* device_android = nullptr;
   if (device) {
     device_android = static_cast<BluetoothDeviceAndroid*>(device);
   }
 
   Java_FakeBluetoothDevice_servicesDiscovered(
       AttachCurrentThread(),
-      device_android ? device_android->GetJavaObject().obj() : nullptr,
+      device_android ? device_android->GetJavaObject() : nullptr,
       0x00000101,  // android.bluetooth.BluetoothGatt.GATT_FAILURE
       nullptr);
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristic(
     BluetoothRemoteGattService* service,
     const std::string& uuid,
     int properties) {
   BluetoothRemoteGattServiceAndroid* service_android =
       static_cast<BluetoothRemoteGattServiceAndroid*>(service);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattService_addCharacteristic(
-      env, service_android->GetJavaObject().obj(),
+      env, service_android->GetJavaObject(),
       base::android::ConvertUTF8ToJavaString(env, uuid), properties);
 }
 
 void BluetoothTestAndroid::RememberCharacteristicForSubsequentAction(
     BluetoothRemoteGattCharacteristic* characteristic) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
 
   Java_FakeBluetoothGattCharacteristic_rememberCharacteristicForSubsequentAction(
       base::android::AttachCurrentThread(),
@@ skipping 16 matching lines @@
   BluetoothRemoteGattDescriptorAndroid* descriptor_android = nullptr;
   if (characteristic) {
     descriptor_android = static_cast<BluetoothRemoteGattDescriptorAndroid*>(
         characteristic
             ->GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
                                        ClientCharacteristicConfigurationUuid())
             .at(0));
   }
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(),
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       0);  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
 }
 
 void BluetoothTestAndroid::SimulateGattNotifySessionStartError(
     BluetoothRemoteGattCharacteristic* characteristic,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android = nullptr;
   if (characteristic) {
     descriptor_android = static_cast<BluetoothRemoteGattDescriptorAndroid*>(
         characteristic
             ->GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
                                        ClientCharacteristicConfigurationUuid())
             .at(0));
   }
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(),
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(error_code));
 }
 
 void BluetoothTestAndroid::SimulateGattNotifySessionStopped(
     BluetoothRemoteGattCharacteristic* characteristic) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android = nullptr;
   if (characteristic) {
     descriptor_android = static_cast<BluetoothRemoteGattDescriptorAndroid*>(
         characteristic
             ->GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
                                        ClientCharacteristicConfigurationUuid())
             .at(0));
   }
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(),
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       0);  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
 }
 
 void BluetoothTestAndroid::SimulateGattNotifySessionStopError(
     BluetoothRemoteGattCharacteristic* characteristic,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android = nullptr;
   if (characteristic) {
     descriptor_android = static_cast<BluetoothRemoteGattDescriptorAndroid*>(
         characteristic
             ->GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
                                        ClientCharacteristicConfigurationUuid())
             .at(0));
   }
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(),
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(error_code));
 }
 
 void BluetoothTestAndroid::
     SimulateGattCharacteristicSetNotifyWillFailSynchronouslyOnce(
         BluetoothRemoteGattCharacteristic* characteristic) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattCharacteristic_setCharacteristicNotificationWillFailSynchronouslyOnce(
       env, characteristic_android->GetJavaObject());
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristicChanged(
     BluetoothRemoteGattCharacteristic* characteristic,
     const std::vector<uint8_t>& value) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattCharacteristic_valueChanged(
-      env,
-      characteristic_android ? characteristic_android->GetJavaObject().obj()
-                             : nullptr,
+      env, characteristic_android ? characteristic_android->GetJavaObject()
+                                  : nullptr,
       base::android::ToJavaByteArray(env, value));
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristicRead(
     BluetoothRemoteGattCharacteristic* characteristic,
     const std::vector<uint8_t>& value) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattCharacteristic_valueRead(
-      env,
-      characteristic_android ? characteristic_android->GetJavaObject().obj()
-                             : nullptr,
+      env, characteristic_android ? characteristic_android->GetJavaObject()
+                                  : nullptr,
       0,  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       base::android::ToJavaByteArray(env, value));
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristicReadError(
     BluetoothRemoteGattCharacteristic* characteristic,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
   std::vector<uint8_t> empty_value;
 
   Java_FakeBluetoothGattCharacteristic_valueRead(
-      env, characteristic_android->GetJavaObject().obj(),
+      env, characteristic_android->GetJavaObject(),
       BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(error_code),
       base::android::ToJavaByteArray(env, empty_value));
 }
 
 void BluetoothTestAndroid::
     SimulateGattCharacteristicReadWillFailSynchronouslyOnce(
         BluetoothRemoteGattCharacteristic* characteristic) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattCharacteristic_setReadCharacteristicWillFailSynchronouslyOnce(
       env, characteristic_android->GetJavaObject());
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristicWrite(
     BluetoothRemoteGattCharacteristic* characteristic) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   Java_FakeBluetoothGattCharacteristic_valueWrite(
       base::android::AttachCurrentThread(),
-      characteristic_android ? characteristic_android->GetJavaObject().obj()
+      characteristic_android ? characteristic_android->GetJavaObject()
                              : nullptr,
       0);  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
 }
 
 void BluetoothTestAndroid::SimulateGattCharacteristicWriteError(
     BluetoothRemoteGattCharacteristic* characteristic,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   Java_FakeBluetoothGattCharacteristic_valueWrite(
@@ skipping 13 matching lines @@
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptor(
     BluetoothRemoteGattCharacteristic* characteristic,
     const std::string& uuid) {
   BluetoothRemoteGattCharacteristicAndroid* characteristic_android =
       static_cast<BluetoothRemoteGattCharacteristicAndroid*>(characteristic);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattCharacteristic_addDescriptor(
-      env, characteristic_android->GetJavaObject().obj(),
+      env, characteristic_android->GetJavaObject(),
       base::android::ConvertUTF8ToJavaString(env, uuid));
 }
 
 void BluetoothTestAndroid::RememberDescriptorForSubsequentAction(
     BluetoothRemoteGattDescriptor* descriptor) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
 
   Java_FakeBluetoothGattDescriptor_rememberDescriptorForSubsequentAction(
       base::android::AttachCurrentThread(),
       descriptor_android->GetJavaObject());
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptorRead(
     BluetoothRemoteGattDescriptor* descriptor,
     const std::vector<uint8_t>& value) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattDescriptor_valueRead(
-      env,
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      env, descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       0,  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       base::android::ToJavaByteArray(env, value));
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptorReadError(
     BluetoothRemoteGattDescriptor* descriptor,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   JNIEnv* env = base::android::AttachCurrentThread();
   std::vector<uint8_t> empty_value;
 
   Java_FakeBluetoothGattDescriptor_valueRead(
-      env, descriptor_android->GetJavaObject().obj(),
+      env, descriptor_android->GetJavaObject(),
       BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(error_code),
       base::android::ToJavaByteArray(env, empty_value));
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptorReadWillFailSynchronouslyOnce(
     BluetoothRemoteGattDescriptor* descriptor) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_FakeBluetoothGattDescriptor_setReadDescriptorWillFailSynchronouslyOnce(
       env, descriptor_android->GetJavaObject());
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptorWrite(
     BluetoothRemoteGattDescriptor* descriptor) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(),
-      descriptor_android ? descriptor_android->GetJavaObject().obj() : nullptr,
+      descriptor_android ? descriptor_android->GetJavaObject() : nullptr,
       0);  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
 }
 
 void BluetoothTestAndroid::SimulateGattDescriptorWriteError(
     BluetoothRemoteGattDescriptor* descriptor,
     BluetoothRemoteGattService::GattErrorCode error_code) {
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   Java_FakeBluetoothGattDescriptor_valueWrite(
       base::android::AttachCurrentThread(), descriptor_android->GetJavaObject(),
@@ skipping 72 matching lines @@
 }
 
 void BluetoothTestAndroid::OnFakeAdapterStateChanged(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const bool powered) {
   adapter_->NotifyAdapterPoweredChanged(powered);
 }
 
 }  // namespace device