bluetooth: android: Accumulate advertised UUIDs.

device/bluetooth/bluetooth_adapter_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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
@@ skipping 528 matching lines @@
                              BluetoothUUID(kTestUUIDImmediateAlert)));
 
   // Discover same device again with updated UUIDs:
   observer.Reset();
   DiscoverLowEnergyDevice(2);
   EXPECT_EQ(0, observer.device_added_count());
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_EQ(1u, adapter_->GetDevices().size());
   EXPECT_EQ(device, observer.last_device());
 
-  // Expect new UUIDs:
-  EXPECT_FALSE(
+  // Expect new AND old UUIDs:
+  EXPECT_TRUE(
       ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDGenericAccess)));
   EXPECT_TRUE(ContainsValue(device->GetUUIDs(),
                             BluetoothUUID(kTestUUIDImmediateAlert)));
 
   // Discover same device again with empty UUIDs:
   observer.Reset();
   DiscoverLowEnergyDevice(3);
   EXPECT_EQ(0, observer.device_added_count());
+#if defined(OS_MACOSX)
+  // TODO(scheib): Call DeviceChanged only if UUIDs change. crbug.com/547106
   EXPECT_EQ(1, observer.device_changed_count());
+#else
+  EXPECT_EQ(0, observer.device_changed_count());
+#endif
   EXPECT_EQ(1u, adapter_->GetDevices().size());
-  EXPECT_EQ(device, observer.last_device());
 
-  // Expect empty UUIDs:
-  EXPECT_EQ(0u, device->GetUUIDs().size());
+  // Expect all UUIDs:
+  EXPECT_EQ(4u, device->GetUUIDs().size());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers multiple devices when addresses vary.
 TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) {
   if (!PlatformSupportsLowEnergy()) {
     LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
     return;
   }
   InitWithFakeAdapter();
   TestBluetoothAdapterObserver observer(adapter_);
 
   // Start discovery and find a device.
   StartLowEnergyDiscoverySession();
   DiscoverLowEnergyDevice(1);
   DiscoverLowEnergyDevice(4);
   EXPECT_EQ(2, observer.device_added_count());
   EXPECT_EQ(2u, adapter_->GetDevices().size());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
 }  // namespace device