Bluetooth: macOS: DidModifyServices can happens while scanning

device/bluetooth/test/bluetooth_test_mac.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_TEST_BLUETOOTH_TEST_MAC_H_
 #define DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_MAC_H_
 
 #include <memory>
 
 #include "base/test/test_simple_task_runner.h"
@@ skipping 85 matching lines @@
       BluetoothRemoteGattDescriptor* descriptor) override;
   void SimulateGattDescriptorWriteError(
       BluetoothRemoteGattDescriptor* descriptor,
       BluetoothRemoteGattService::GattErrorCode error_code) override;
   void ExpectedChangeNotifyValueAttempts(int attempts) override;
   void ExpectedNotifyValue(NotifyValueState expected_value_state) override;
 
   // macOS is the only platform for which we need to discover each set of
   // attributes individually so we need a method to simulate discovering each
   // set of attributes.
-  void SimulateDidDiscoverServices(BluetoothDevice* device,
-                                   const std::vector<std::string>& uuids);
+  // Simulates service discovery for a device.
+  void SimulateDidDiscoverServicesMac(BluetoothDevice* device);
+  // Simulates characteristic discovery for a service.
+  void SimulateDidDiscoverCharacteristicsMac(
+      BluetoothRemoteGattService* service);
+  // Simulates descriptor discovery for a characteristic.
+  void SimulateDidDiscoverDescriptorsMac(
+      BluetoothRemoteGattCharacteristic* characteristic);
   // CoreBluetooth can return NSData when reading remote gatt descriptors.
   // This methods simulate receiving NSData from CoreBluetooth.
-  void SimulateGattDescriptorReadNSData(
+  void SimulateGattDescriptorReadNSDataMac(
       BluetoothRemoteGattDescriptor* descriptor,
       const std::vector<uint8_t>& value);
   // CoreBluetooth can return NSString when reading remote gatt descriptors.
   // This methods simulate receiving NSString from CoreBluetooth.
-  void SimulateGattDescriptorReadNSString(
+  void SimulateGattDescriptorReadNSStringMac(
       BluetoothRemoteGattDescriptor* descriptor,
       const std::string& value);
   // CoreBluetooth can return NSString when reading remote gatt descriptors.
   // This methods simulate receiving NSString from CoreBluetooth.
-  void SimulateGattDescriptorReadNSNumber(
+  void SimulateGattDescriptorReadNSNumberMac(
       BluetoothRemoteGattDescriptor* descriptor,
       short value);
 
+  // Adds services in MockCBPeripheral.
+  void AddServicesToDevice(BluetoothDevice* device,

[scheib, 2017/05/01 17:20:33]

Please add the Mac suffix to these as well.

[jlebel, 2017/05/01 21:27:14]

Ok, I was thinking that those methods could be used for crbug.com/713922

[scheib, 2017/05/01 21:44:22]

Ok, but let's rename them if/when they are moved to cross platform test fixture.

+                           const std::vector<std::string>& uuids);
+  // Adds a characteristic in MockCBService.
+  void AddCharacteristicToService(BluetoothRemoteGattService* service,
+                                  const std::string& characteristic_uuid,
+                                  int properties);
+  // Adds a descriptor in MockCBCharacteristic.
+  void AddDescriptorToCharacteristic(
+      BluetoothRemoteGattCharacteristic* characteristic,
+      const std::string& uuid);
+
   // Callback for the bluetooth central manager mock.
   void OnFakeBluetoothDeviceConnectGattCalled();
   void OnFakeBluetoothGattDisconnect();
 
   // Callback for the bluetooth peripheral mock.
   void OnFakeBluetoothServiceDiscovery();
   void OnFakeBluetoothCharacteristicDiscovery();
   void OnFakeBluetoothCharacteristicReadValue();
   void OnFakeBluetoothCharacteristicWriteValue(std::vector<uint8_t> value);
   void OnFakeBluetoothGattSetCharacteristicNotification(bool notify_value);
@@ skipping 18 matching lines @@
       BluetoothRemoteGattCharacteristic* characteristic) const;
   // Returns MockCBPeripheral from BluetoothRemoteGattDescriptor.
   MockCBPeripheral* GetMockCBPeripheral(
       BluetoothRemoteGattDescriptor* descriptor) const;
   // Returns MockCBCharacteristic from BluetoothRemoteGattCharacteristic.
   MockCBCharacteristic* GetCBMockCharacteristic(
       BluetoothRemoteGattCharacteristic* characteristic) const;
   // Returns MockCBDescriptor from BluetoothRemoteGattDescriptor.
   MockCBDescriptor* GetCBMockDescriptor(
       BluetoothRemoteGattDescriptor* descriptor) const;
-  // Adds services in MockCBPeripheral.
-  void AddServicesToDevice(BluetoothDevice* device,
-                           const std::vector<std::string>& uuids);
 
   // Utility function for finding CBUUIDs with relatively nice SHA256 hashes.
   std::string FindCBUUIDForHashTarget();
 
   BluetoothAdapterMac* adapter_mac_ = nullptr;
   std::unique_ptr<ScopedMockCentralManager> mock_central_manager_;
 
   // Value set by -[CBPeripheral setNotifyValue:forCharacteristic:] call.
   bool last_notify_value_ = false;
   int gatt_characteristic_discovery_attempts_ = 0;
 };
 
 // Defines common test fixture name. Use TEST_F(BluetoothTest, YourTestName).
 typedef BluetoothTestMac BluetoothTest;
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_MAC_H_