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

device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
@@ skipping 13 matching lines @@
  public:
   // Create a BluetoothRemoteGattCharacteristicAndroid instance and associated
   // Java
   // ChromeBluetoothRemoteGattCharacteristic using the provided
   // |bluetooth_gatt_characteristic_wrapper|.
   //
   // The ChromeBluetoothRemoteGattCharacteristic instance will hold a Java
   // reference
   // to |bluetooth_gatt_characteristic_wrapper|.
   static scoped_ptr<BluetoothRemoteGattCharacteristicAndroid> Create(
-      const std::string& instanceId,
+      const std::string& instance_id,
       jobject /* BluetoothGattCharacteristicWrapper */
       bluetooth_gatt_characteristic_wrapper,
       jobject /* ChromeBluetoothDevice */ chrome_bluetooth_device);
 
   ~BluetoothRemoteGattCharacteristicAndroid() override;
 
   // Register C++ methods exposed to Java using JNI.
   static bool RegisterJNI(JNIEnv* env);
 
   // Returns the associated ChromeBluetoothRemoteGattCharacteristic Java object.
@@ skipping 26 matching lines @@
               const base::android::JavaParamRef<jobject>& jcaller,
               int32_t status,
               const base::android::JavaParamRef<jbyteArray>& value);
 
   // Callback after Write operation completes.
   void OnWrite(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& jcaller,
                int32_t status);
 
  private:
-  BluetoothRemoteGattCharacteristicAndroid(const std::string& instanceId);
+  BluetoothRemoteGattCharacteristicAndroid(const std::string& instance_id);
 
   // Java object
   // org.chromium.device.bluetooth.ChromeBluetoothRemoteGattCharacteristic.
   base::android::ScopedJavaGlobalRef<jobject> j_characteristic_;
 
   // Adapter unique instance ID.
   std::string instance_id_;
 
   // ReadRemoteCharacteristic callbacks and pending state.
   bool read_pending_ = false;
   ValueCallback read_callback_;
   ErrorCallback read_error_callback_;
 
   // WriteRemoteCharacteristic callbacks and pending state.
   bool write_pending_ = false;
   base::Closure write_callback_;
   ErrorCallback write_error_callback_;
 
   std::vector<uint8_t> value_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_