Bluetooth: macOS: DidModifyServices can happens while scanning

device/bluetooth/bluetooth_device_unittest.cc

 // Copyright 2014 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.
 
 #include "device/bluetooth/bluetooth_device.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 447 matching lines @@
   EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());
 
   observer.Reset();
   SimulateGattServicesChanged(device);
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());
 
   // Fist system call to
   // -[id<CBPeripheralDelegate> peripheral:didDiscoverServices:]
   observer.Reset();
-  SimulateDidDiscoverServices(device, {kTestUUIDHeartRate});
+  AddServicesToDevice(device, {kTestUUIDHeartRate});
+  SimulateDidDiscoverServices(device);
   EXPECT_EQ(0, observer.device_changed_count());
   EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());
   EXPECT_EQ(gatt_characteristic_discovery_attempts_, 0);
 
   // Second system call to
   // -[id<CBPeripheralDelegate> peripheral:didDiscoverServices:]
   SimulateGattServicesDiscovered(
       device, std::vector<std::string>({kTestUUIDImmediateAlert}));
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
@@ skipping 27 matching lines @@
   observer.Reset();
   SimulateGattServicesDiscovered(
       device, std::vector<std::string>({kTestUUIDHeartRate}));
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
   EXPECT_EQ(gatt_characteristic_discovery_attempts_, 1);
   EXPECT_EQ(1u, device->GetGattServices().size());
 
   // Unexpected system call to
   // -[id<CBPeripheralDelegate> peripheral:didDiscoverServices:]
-  SimulateDidDiscoverServices(device, {kTestUUIDImmediateAlert});
+  AddServicesToDevice(device, {kTestUUIDImmediateAlert});
+  SimulateDidDiscoverServices(device);
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
 
   EXPECT_EQ(1u, device->GetGattServices().size());
 }
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Tests Advertisement Data is updated correctly when we start discovery
 // during a connection.
@@ skipping 1086 matching lines @@
                   .empty());
   EXPECT_TRUE(device_
                   ->GetCharacteristicsByUUID(
                       service_instance_id2,
                       BluetoothUUID(characteristic_uuid_not_exist_in_setup))
                   .empty());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
 }  // namespace device