bluetooth: android: Clean up BluetoothRemoteGattServiceAndroid.

device/bluetooth/bluetooth_remote_gatt_service_android.cc

 // Copyright 2014 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_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_device_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
 #include "jni/ChromeBluetoothRemoteGattService_jni.h"
 
 using base::android::AttachCurrentThread;
 
 namespace device {
 
 // static
 BluetoothRemoteGattServiceAndroid* BluetoothRemoteGattServiceAndroid::Create(
     BluetoothAdapterAndroid* adapter,
     BluetoothDeviceAndroid* device,
-    jobject bluetooth_remote_gatt_service_wrapper,
+    jobject bluetooth_gatt_service_wrapper,
     const std::string& instanceId) {
   BluetoothRemoteGattServiceAndroid* service =
       new BluetoothRemoteGattServiceAndroid(adapter, device, instanceId);
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = AttachCurrentThread();
   service->j_service_.Reset(Java_ChromeBluetoothRemoteGattService_create(
-      env, reinterpret_cast<intptr_t>(service),
-      bluetooth_remote_gatt_service_wrapper,
+      env, reinterpret_cast<intptr_t>(service), bluetooth_gatt_service_wrapper,
       base::android::ConvertUTF8ToJavaString(env, instanceId).obj()));
 
   return service;
 }
 
+BluetoothRemoteGattServiceAndroid::~BluetoothRemoteGattServiceAndroid() {
+  Java_ChromeBluetoothRemoteGattService_onBluetoothRemoteGattServiceAndroidDestruction(
+      AttachCurrentThread(), j_service_.obj());
+}
+
 // static
 bool BluetoothRemoteGattServiceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(
       env);  // Generated in ChromeBluetoothRemoteGattService_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothRemoteGattServiceAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_service_);
 }
@@ skipping 83 matching lines @@
       instanceIdString,
       BluetoothRemoteGattCharacteristicAndroid::Create(instanceIdString));
 }
 
 BluetoothRemoteGattServiceAndroid::BluetoothRemoteGattServiceAndroid(
     BluetoothAdapterAndroid* adapter,
     BluetoothDeviceAndroid* device,
     const std::string& instanceId)
     : adapter_(adapter), device_(device), instanceId_(instanceId) {}
 
-BluetoothRemoteGattServiceAndroid::~BluetoothRemoteGattServiceAndroid() {
-  Java_ChromeBluetoothRemoteGattService_onBluetoothRemoteGattServiceAndroidDestruction(
-      AttachCurrentThread(), j_service_.obj());
-}
-
 void BluetoothRemoteGattServiceAndroid::EnsureCharacteristicsCreated() const {
   if (!characteristics_.empty())
     return;
 
   // Java call
   Java_ChromeBluetoothRemoteGattService_ensureCharacteristicsCreated(
       AttachCurrentThread(), j_service_.obj());
 }
 
 }  // namespace device