bluetooth: android: Code cleanup fixing comments, typos, simplified names.

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
 scoped_ptr<BluetoothRemoteGattServiceAndroid>
 BluetoothRemoteGattServiceAndroid::Create(
     BluetoothAdapterAndroid* adapter,
     BluetoothDeviceAndroid* device,
     jobject /* BluetoothGattServiceWrapper */ bluetooth_gatt_service_wrapper,
-    const std::string& instanceId,
+    const std::string& instance_id,
     jobject /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
   scoped_ptr<BluetoothRemoteGattServiceAndroid> service(
-      new BluetoothRemoteGattServiceAndroid(adapter, device, instanceId));
+      new BluetoothRemoteGattServiceAndroid(adapter, device, instance_id));
 
   JNIEnv* env = AttachCurrentThread();
   service->j_service_.Reset(Java_ChromeBluetoothRemoteGattService_create(
       env, reinterpret_cast<intptr_t>(service.get()),
       bluetooth_gatt_service_wrapper,
-      base::android::ConvertUTF8ToJavaString(env, instanceId).obj(),
+      base::android::ConvertUTF8ToJavaString(env, instance_id).obj(),
       chrome_bluetooth_device));
 
   return service;
 }
 
 BluetoothRemoteGattServiceAndroid::~BluetoothRemoteGattServiceAndroid() {
   Java_ChromeBluetoothRemoteGattService_onBluetoothRemoteGattServiceAndroidDestruction(
       AttachCurrentThread(), j_service_.obj());
 }
 
@@ skipping 56 matching lines @@
     case GATT_ERROR_NOT_PAIRED:
       return 0x00000101;  // GATT_FAILURE. No good match.
     case GATT_ERROR_NOT_SUPPORTED:
       return 0x00000006;  // GATT_REQUEST_NOT_SUPPORTED
   }
   VLOG(1) << "Unhandled error_code: " << error_code;
   return 0x00000101;  // GATT_FAILURE. No good match.
 }
 
 std::string BluetoothRemoteGattServiceAndroid::GetIdentifier() const {
-  return instanceId_;
+  return instance_id_;
 }
 
 device::BluetoothUUID BluetoothRemoteGattServiceAndroid::GetUUID() const {
   return device::BluetoothUUID(
       ConvertJavaStringToUTF8(Java_ChromeBluetoothRemoteGattService_getUUID(
           AttachCurrentThread(), j_service_.obj())));
 }
 
 bool BluetoothRemoteGattServiceAndroid::IsLocal() const {
   return false;
@@ skipping 51 matching lines @@
 
 void BluetoothRemoteGattServiceAndroid::Unregister(
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   error_callback.Run();
 }
 
 void BluetoothRemoteGattServiceAndroid::CreateGattRemoteCharacteristic(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
-    const JavaParamRef<jstring>& instanceId,
+    const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>& /* BluetoothGattCharacteristicWrapper */
     bluetooth_gatt_characteristic_wrapper,
     const JavaParamRef<
         jobject>& /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
-  std::string instanceIdString =
-      base::android::ConvertJavaStringToUTF8(env, instanceId);
+  std::string instance_id_string =
+      base::android::ConvertJavaStringToUTF8(env, instance_id);
 
-  DCHECK(!characteristics_.contains(instanceIdString));
+  DCHECK(!characteristics_.contains(instance_id_string));
 
   characteristics_.set(
-      instanceIdString,
+      instance_id_string,
       BluetoothRemoteGattCharacteristicAndroid::Create(
-          instanceIdString, bluetooth_gatt_characteristic_wrapper,
+          instance_id_string, bluetooth_gatt_characteristic_wrapper,
           chrome_bluetooth_device));
 }
 
 BluetoothRemoteGattServiceAndroid::BluetoothRemoteGattServiceAndroid(
     BluetoothAdapterAndroid* adapter,
     BluetoothDeviceAndroid* device,
-    const std::string& instanceId)
-    : adapter_(adapter), device_(device), instanceId_(instanceId) {}
+    const std::string& instance_id)
+    : adapter_(adapter), device_(device), instance_id_(instance_id) {}
 
 void BluetoothRemoteGattServiceAndroid::EnsureCharacteristicsCreated() const {
   if (!characteristics_.empty())
     return;
 
   // Java call
   Java_ChromeBluetoothRemoteGattService_ensureCharacteristicsCreated(
       AttachCurrentThread(), j_service_.obj());
 }
 
 }  // namespace device