Fixed 2 bugs so that RequestDevice() works for non-paired devices

device/bluetooth/bluetooth_low_energy_device_mac.mm

 // 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.
 
 #include "device/bluetooth/bluetooth_low_energy_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 35 matching lines @@
                                          NSDictionary* advertisement_data,
                                          int rssi) {
   last_update_time_.reset([[NSDate date] retain]);
   peripheral_.reset([peripheral retain]);
   rssi_ = rssi;
   NSNumber* connectable =
       [advertisement_data objectForKey:CBAdvertisementDataIsConnectable];
   connectable_ = [connectable boolValue];
   ClearServiceData();
   NSDictionary* service_data =
-      [advertisement_data objectForKey:@"CBAdvertisementDataServiceDataKey"];
+      [advertisement_data objectForKey:CBAdvertisementDataServiceDataKey];
   for (CBUUID* uuid in service_data) {
     NSData* data = [service_data objectForKey:uuid];
     BluetoothUUID service_uuid = BluetoothUUIDWithCBUUID(uuid);
     SetServiceData(service_uuid, static_cast<const char*>([data bytes]),
                    [data length]);
   }
-  advertised_uuids_.clear();
   NSArray* service_uuids =
-      [advertisement_data objectForKey:@"CBAdvertisementDataServiceUUIDsKey"];
+      [advertisement_data objectForKey:CBAdvertisementDataServiceUUIDsKey];
   for (CBUUID* uuid in service_uuids) {
-    advertised_uuids_.push_back(
+    advertised_uuids_.insert(
+        BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
+  }
+  NSArray* overflow_service_uuids = [advertisement_data
+      objectForKey:CBAdvertisementDataOverflowServiceUUIDsKey];
+  for (CBUUID* uuid in overflow_service_uuids) {
+    advertised_uuids_.insert(
         BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
   }
 }
 
 std::string BluetoothLowEnergyDeviceMac::GetIdentifier() const {
   return identifier_;
 }
 
 uint32 BluetoothLowEnergyDeviceMac::GetBluetoothClass() const {
   return 0x1F00;  // Unspecified Device Class
@@ skipping 34 matching lines @@
 
 bool BluetoothLowEnergyDeviceMac::IsConnectable() const {
   return connectable_;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnecting() const {
   return false;
 }
 
 BluetoothDevice::UUIDList BluetoothLowEnergyDeviceMac::GetUUIDs() const {
-  return advertised_uuids_;
+  BluetoothDevice::UUIDList advertised_uuids_list;

[scheib, 2015/08/05 00:04:35]

Hmm.. yep, have to either make copies here... or keep a vector and test for
inclusion... or keep a vector and a set and use the set to test. OK, probably
what's going on here is fine, but let's use std::vector's constructor to make
the copy of the set:

return BluetoothDevice::UUIDList(advertised_uuids_.begin(),
advertised_uuids_.end());

[krstnmnlsn, 2015/08/05 16:44:09]

Done.

+  for (BluetoothUUID uuid : advertised_uuids_)
+    advertised_uuids_list.push_back(uuid);
+  return advertised_uuids_list;
 }
 
 int16 BluetoothLowEnergyDeviceMac::GetInquiryRSSI() const {
   return kUnknownPower;
 }
 
 int16 BluetoothLowEnergyDeviceMac::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
@@ skipping 106 matching lines @@
       instanceMethodSignatureForSelector:@selector(state)] retain]);
   base::scoped_nsobject<NSInvocation> invocation(
       [[NSInvocation invocationWithMethodSignature:signature] retain]);
   [invocation setTarget:peripheral_];
   [invocation setSelector:@selector(state)];
   [invocation invoke];
   CBPeripheralState state = CBPeripheralStateDisconnected;
   [invocation getReturnValue:&state];
   return state;
 }