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

device/bluetooth/bluetooth_remote_gatt_service_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_SERVICE_ANDROID_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
   // Create a BluetoothRemoteGattServiceAndroid instance and associated Java
   // ChromeBluetoothRemoteGattService using the provided
   // |bluetooth_gatt_service_wrapper|.
   //
   // The ChromeBluetoothRemoteGattService instance will hold a Java reference
   // to |bluetooth_gatt_service_wrapper|.
   static scoped_ptr<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);
 
   ~BluetoothRemoteGattServiceAndroid() override;
 
   // Register C++ methods exposed to Java using JNI.
   static bool RegisterJNI(JNIEnv* env);
 
   // Returns the associated ChromeBluetoothRemoteGattService Java object.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
@@ skipping 21 matching lines @@
       const std::string& identifier) const override;
   bool AddCharacteristic(
       device::BluetoothGattCharacteristic* characteristic) override;
   bool AddIncludedService(device::BluetoothGattService* service) override;
   void Register(const base::Closure& callback,
                 const ErrorCallback& error_callback) override;
   void Unregister(const base::Closure& callback,
                   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,
       const base::android::JavaParamRef<
           jobject>& /* ChromeBluetoothDevice */ chrome_bluetooth_device);
 
  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;
 
   // Java object org.chromium.device.bluetooth.ChromeBluetoothRemoteGattService.
   base::android::ScopedJavaGlobalRef<jobject> j_service_;
 
   // The adapter associated with this service. It's ok to store a raw pointer
   // here since |adapter_| indirectly owns this instance.
   BluetoothAdapterAndroid* adapter_;
 
   // The device this GATT service belongs to. It's ok to store a raw pointer
   // here since |device_| owns this instance.
   BluetoothDeviceAndroid* device_;
 
   // Adapter unique instance ID.
-  std::string instanceId_;
+  std::string instance_id_;
 
   // Map of characteristics, keyed by characteristic identifier.
   base::ScopedPtrHashMap<std::string,
                          scoped_ptr<BluetoothRemoteGattCharacteristicAndroid>>
       characteristics_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattServiceAndroid);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_