bluetooth: android: Rename FakeBluetoothLeScanner.mCallback to mScanCallback.

device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java

Index: device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
diff --git a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
index e5fa0f55c4c4af66f2394a9c118735ad18bbdd81..5ebb63dfb86017951751cbb73f428a229b368bd6 100644
--- a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
+++ b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
@@ -60,10 +60,10 @@ class Fakes {
                     uuids.add(ParcelUuid.fromString("00001800-0000-1000-8000-00805f9b34fb"));
                     uuids.add(ParcelUuid.fromString("00001801-0000-1000-8000-00805f9b34fb"));
 
-                    mFakeScanner.mCallback.onScanResult(ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
+                    mFakeScanner.mScanCallback.onScanResult(ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
                             new FakeScanResult(new FakeBluetoothDevice(this, "01:00:00:90:1E:BE",
                                                        "FakeBluetoothDevice"),
-                                                                uuids));
+                                                                    uuids));

[Jeffrey Yasskin, 2015/09/21 18:30:52]

This indentation is weird.

[scheib, 2015/09/21 19:53:19]

Weird but consistent. It is enforced by 'git cl format'. I've filed an issue:
https://code.google.com/p/chromium/issues/detail?id=534538

                     break;
                 }
                 case 2: {
@@ -71,15 +71,15 @@ class Fakes {
                     uuids.add(ParcelUuid.fromString("00001802-0000-1000-8000-00805f9b34fb"));
                     uuids.add(ParcelUuid.fromString("00001803-0000-1000-8000-00805f9b34fb"));
 
-                    mFakeScanner.mCallback.onScanResult(ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
+                    mFakeScanner.mScanCallback.onScanResult(ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
                             new FakeScanResult(new FakeBluetoothDevice(this, "01:00:00:90:1E:BE",
                                                        "FakeBluetoothDevice"),
-                                                                uuids));
+                                                                    uuids));

[Jeffrey Yasskin, 2015/09/21 18:30:52]

Here too.

[scheib, 2015/09/21 19:53:19]

Ditto.

                     break;
                 }
                 case 3: {
                     ArrayList<ParcelUuid> uuids = null;
-                    mFakeScanner.mCallback.onScanResult(
+                    mFakeScanner.mScanCallback.onScanResult(
                             ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
                             new FakeScanResult(
                                     new FakeBluetoothDevice(this, "01:00:00:90:1E:BE", ""), uuids));
@@ -88,7 +88,7 @@ class Fakes {
                 }
                 case 4: {
                     ArrayList<ParcelUuid> uuids = null;
-                    mFakeScanner.mCallback.onScanResult(
+                    mFakeScanner.mScanCallback.onScanResult(
                             ScanSettings.CALLBACK_TYPE_ALL_MATCHES,
                             new FakeScanResult(
                                     new FakeBluetoothDevice(this, "02:00:00:8B:74:63", ""), uuids));
@@ -131,7 +131,7 @@ class Fakes {
      * Fakes android.bluetooth.le.BluetoothLeScanner.
      */
     static class FakeBluetoothLeScanner extends Wrappers.BluetoothLeScannerWrapper {
-        public Wrappers.ScanCallbackWrapper mCallback;
+        public Wrappers.ScanCallbackWrapper mScanCallback;
 
         private FakeBluetoothLeScanner() {
             super(null);
@@ -140,19 +140,19 @@ class Fakes {
         @Override
         public void startScan(List<ScanFilter> filters, int scanSettingsScanMode,
                 Wrappers.ScanCallbackWrapper callback) {
-            if (mCallback != null) {
+            if (mScanCallback != null) {
                 throw new IllegalArgumentException(
                         "FakeBluetoothLeScanner does not support multiple scans.");
             }
-            mCallback = callback;
+            mScanCallback = callback;
         }
 
         @Override
         public void stopScan(Wrappers.ScanCallbackWrapper callback) {
-            if (mCallback != callback) {
+            if (mScanCallback != callback) {
                 throw new IllegalArgumentException("No scan in progress.");
             }
-            mCallback = null;
+            mScanCallback = null;
         }
     }