Revert of Bringing 4 more BluetoothTest.* unit tests to Mac

device/bluetooth/bluetooth_low_energy_device_mac.mm

Index: device/bluetooth/bluetooth_low_energy_device_mac.mm
diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.mm b/device/bluetooth/bluetooth_low_energy_device_mac.mm
index 875ab196b1767317033e2637934d5ea34c741078..4e4ca6431bebfecc47f1db275726866868109c78 100644
--- a/device/bluetooth/bluetooth_low_energy_device_mac.mm
+++ b/device/bluetooth/bluetooth_low_energy_device_mac.mm
@@ -31,41 +31,33 @@
 
 BluetoothLowEnergyDeviceMac::BluetoothLowEnergyDeviceMac(
     CBPeripheral* peripheral,
-    NSDictionary* advertisement_data,
+    NSDictionary* advertisementData,
     int rssi) {
   DCHECK(BluetoothAdapterMac::IsLowEnergyAvailable());
   identifier_ = GetPeripheralIdentifier(peripheral);
   hash_address_ = GetPeripheralHashAddress(peripheral);
-  Update(peripheral, advertisement_data, rssi);
+  Update(peripheral, advertisementData, rssi);
 }
 
 BluetoothLowEnergyDeviceMac::~BluetoothLowEnergyDeviceMac() {
 }
 
 void BluetoothLowEnergyDeviceMac::Update(CBPeripheral* peripheral,
-                                         NSDictionary* advertisement_data,
+                                         NSDictionary* advertisementData,
                                          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"];
-  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"];
-  for (CBUUID* uuid in service_uuids) {
-    advertised_uuids_.push_back(
-        BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
+  NSNumber* nbConnectable =
+      [advertisementData objectForKey:CBAdvertisementDataIsConnectable];
+  connectable_ = [nbConnectable boolValue];
+  NSDictionary* serviceData =
+      [advertisementData objectForKey:CBAdvertisementDataServiceDataKey];
+  for (CBUUID* uuid in serviceData) {
+    NSData* data = [serviceData objectForKey:uuid];
+    BluetoothUUID serviceUUID = BluetoothUUIDWithCBUUID(uuid);
+    SetServiceData(serviceUUID, (const char*)[data bytes], [data length]);
   }
 }
 
@@ -119,7 +111,7 @@
 }
 
 BluetoothDevice::UUIDList BluetoothLowEnergyDeviceMac::GetUUIDs() const {
-  return advertised_uuids_;
+  return std::vector<device::BluetoothUUID>();
 }
 
 int16 BluetoothLowEnergyDeviceMac::GetInquiryRSSI() const {