Pass JavaRef to Java methods in device/bluetooth.

device/bluetooth/bluetooth_device_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_device_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
 #include "jni/ChromeBluetoothDevice_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
+using base::android::JavaRef;
 
 namespace device {
 namespace {
 void RecordConnectionSuccessResult(int32_t status) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Bluetooth.Android.GATTConnection.Success.Result",
                               status);
 }
 void RecordConnectionFailureResult(int32_t status) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Bluetooth.Android.GATTConnection.Failure.Result",
                               status);
 }
 void RecordConnectionTerminatedResult(int32_t status) {
   UMA_HISTOGRAM_SPARSE_SLOWLY(
       "Bluetooth.Android.GATTConnection.Disconnected.Result", status);
 }
 }  // namespace
 
 BluetoothDeviceAndroid* BluetoothDeviceAndroid::Create(
     BluetoothAdapterAndroid* adapter,
-    jobject bluetooth_device_wrapper) {  // Java Type: bluetoothDeviceWrapper
+    const JavaRef<jobject>&
+        bluetooth_device_wrapper) {  // Java Type: bluetoothDeviceWrapper
   BluetoothDeviceAndroid* device = new BluetoothDeviceAndroid(adapter);
 
   device->j_device_.Reset(Java_ChromeBluetoothDevice_create(
       AttachCurrentThread(), reinterpret_cast<intptr_t>(device),
       bluetooth_device_wrapper));
 
   return device;
 }
 
 BluetoothDeviceAndroid::~BluetoothDeviceAndroid() {
@@ skipping 197 matching lines @@
       base::android::ConvertJavaStringToUTF8(env, instance_id);
 
   if (gatt_services_.contains(instance_id_string))
     return;
 
   BluetoothDevice::GattServiceMap::iterator service_iterator =
       gatt_services_.set(
           instance_id_string,
           BluetoothRemoteGattServiceAndroid::Create(
               GetAndroidAdapter(), this, bluetooth_gatt_service_wrapper,
-              instance_id_string, j_device_.obj()));
+              instance_id_string, j_device_));
 
   adapter_->NotifyGattServiceAdded(service_iterator->second);
 }
 
 BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
     : BluetoothDevice(adapter) {}
 
 void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
   Java_ChromeBluetoothDevice_createGattConnectionImpl(
       AttachCurrentThread(), j_device_, base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(), j_device_);
 }
 
 }  // namespace device