bluetooth: macOS: Support for extra didConnectPeripheral event from macOS.

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 997 matching lines @@
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Calls CreateGattConnection then simulates multiple connections from platform.
 TEST_F(BluetoothTest,
        BluetoothGattConnection_ConnectWithMultipleOSConnections) {
   if (!PlatformSupportsLowEnergy()) {
     LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
     return;
   }
   InitWithFakeAdapter();
+  TestBluetoothAdapterObserver observer(adapter_);
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = SimulateLowEnergyDevice(3);
 
   // CreateGattConnection, & multiple connections from platform only invoke
   // callbacks once:
   ResetEventCounts();
   device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
                                GetConnectErrorCallback(Call::NOT_EXPECTED));
   SimulateGattConnection(device);
   SimulateGattConnection(device);
   base::RunLoop().RunUntilIdle();
 
+#if !defined(OS_ANDROID)

[ortuno, 2017/05/04 00:31:03]

#if defined(OS_ANDROID)
  EXPECT_EQ(2, gatt_discovery_attempts_);
#else   // !defined(OS_ANDROID)
  EXPECT_EQ(1, gatt_discovery_attempts_);
#endif  // defined(OS_ANDROID)

[jlebel, 2017/05/04 01:18:38]

Done.

+  // TODO(crbug.com/718168): on Android gatt_discovery_attempts_ is 2.

[ortuno, 2017/05/04 00:31:03]

// Android incorrectly starts second discovery for devices that are already
connected.
// TODO(crbug.com/718168): Remove once Android is fixed.

[jlebel, 2017/05/04 01:18:38]

Done.

+  EXPECT_EQ(1, gatt_discovery_attempts_);
+#endif  // !defined(OS_ANDROID)
+  EXPECT_EQ(2, observer.device_changed_count());
   EXPECT_EQ(1, gatt_connection_attempts_);
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
   EXPECT_TRUE(gatt_connections_[0]->IsConnected());
 
   // Become disconnected:
   SimulateGattDisconnection(device);
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(gatt_connections_[0]->IsConnected());
 }
@@ skipping 558 matching lines @@
                     ->GetPrimaryServicesByUUID(BluetoothUUID(
                         BluetoothTestBase::kTestUUIDGenericAttribute))
                     .empty());
 
     EXPECT_NE(services[0]->GetIdentifier(), services[1]->GetIdentifier());
   }
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
 }  // namespace device