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

device/bluetooth/bluetooth_remote_gatt_service_android.h

Index: device/bluetooth/bluetooth_remote_gatt_service_android.h
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.h b/device/bluetooth/bluetooth_remote_gatt_service_android.h
index 6bcf9103b42520d07867c6bf7b600a2bae0810ac..46d5619f3b00395ba2971caefe4e0c6ab8153de8 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_android.h
+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.h
@@ -37,7 +37,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid
       BluetoothAdapterAndroid* adapter,
       BluetoothDeviceAndroid* device,
       jobject /* BluetoothGattServiceWrapper */ bluetooth_gatt_service_wrapper,
-      const std::string& instanceId,
+      const std::string& instance_id,
       jobject /* ChromeBluetoothDevice */ chrome_bluetooth_device);
 
   ~BluetoothRemoteGattServiceAndroid() override;
@@ -79,11 +79,11 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid
                   const ErrorCallback& error_callback) override;
 
   // Creates a Bluetooth GATT characteristic object and adds it to
-  // |characteristics_| if it is not already there.
+  // |characteristics_|, DCHECKing that it has not already been created.
   void CreateGattRemoteCharacteristic(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& caller,
-      const base::android::JavaParamRef<jstring>& instanceId,
+      const base::android::JavaParamRef<jstring>& instance_id,
       const base::android::JavaParamRef<
           jobject>& /* BluetoothGattCharacteristicWrapper */
       bluetooth_gatt_characteristic_wrapper,
@@ -93,7 +93,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid
  private:
   BluetoothRemoteGattServiceAndroid(BluetoothAdapterAndroid* adapter,
                                     BluetoothDeviceAndroid* device,
-                                    const std::string& instanceId);
+                                    const std::string& instance_id);
 
   // Populates |characteristics_| from Java objects if necessary.
   void EnsureCharacteristicsCreated() const;
@@ -110,7 +110,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid
   BluetoothDeviceAndroid* device_;
 
   // Adapter unique instance ID.
-  std::string instanceId_;
+  std::string instance_id_;
 
   // Map of characteristics, keyed by characteristic identifier.
   base::ScopedPtrHashMap<std::string,