bluetooth: Refactor BluetoothTest member names.

device/bluetooth/test/bluetooth_test_android.cc

Index: device/bluetooth/test/bluetooth_test_android.cc
diff --git a/device/bluetooth/test/bluetooth_test_android.cc b/device/bluetooth/test/bluetooth_test_android.cc
index 8e0951dd641e9e95fcb63972be57799b987dc420..34dbdb64aed056336754130db56d6ccd9ada2a47 100644
--- a/device/bluetooth/test/bluetooth_test_android.cc
+++ b/device/bluetooth/test/bluetooth_test_android.cc
@@ -57,7 +57,7 @@ BluetoothDevice* BluetoothTestAndroid::DiscoverLowEnergyDevice(
   return observer.last_device();
 }
 
-void BluetoothTestAndroid::CompleteGattConnection(BluetoothDevice* device) {
+void BluetoothTestAndroid::SimulateGattConnection(BluetoothDevice* device) {
   BluetoothDeviceAndroid* device_android =
       static_cast<BluetoothDeviceAndroid*>(device);
 
@@ -67,7 +67,7 @@ void BluetoothTestAndroid::CompleteGattConnection(BluetoothDevice* device) {
       true);  // connected
 }
 
-void BluetoothTestAndroid::FailGattConnection(
+void BluetoothTestAndroid::SimulateGattConnectionError(
     BluetoothDevice* device,
     BluetoothDevice::ConnectErrorCode error) {
   int android_error_value = 0;
@@ -96,7 +96,7 @@ void BluetoothTestAndroid::FailGattConnection(
       false);  // connected
 }
 
-void BluetoothTestAndroid::CompleteGattDisconnection(BluetoothDevice* device) {
+void BluetoothTestAndroid::SimulateGattDisconnection(BluetoothDevice* device) {
   BluetoothDeviceAndroid* device_android =
       static_cast<BluetoothDeviceAndroid*>(device);
 
@@ -106,16 +106,15 @@ void BluetoothTestAndroid::CompleteGattDisconnection(BluetoothDevice* device) {
       false);  // disconnected
 }
 
-// Records that Java FakeBluetoothDevice connectGatt was called.
-void BluetoothTestAndroid::OnBluetoothDeviceConnectGattCalled(JNIEnv* env,
-                                                              jobject caller) {
-  gatt_connection_attempt_count_++;
+void BluetoothTestAndroid::OnFakeBluetoothDeviceConnectGattCalled(
+    JNIEnv* env,
+    jobject caller) {
+  gatt_connection_attempts_++;
 }
 
-// Records that Java FakeBluetoothGatt disconnect was called.
 void BluetoothTestAndroid::OnFakeBluetoothGattDisconnect(JNIEnv* env,
                                                          jobject caller) {
-  gatt_disconnection_attempt_count_++;
+  gatt_disconnection_attempts_++;
 }
 
 }  // namespace device