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

device/bluetooth/bluetooth_low_energy_device_mac.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
 
 #if defined(OS_IOS)
 #import <CoreBluetooth/CoreBluetooth.h>
 #else  // !defined(OS_IOS)
 #import <IOBluetooth/IOBluetooth.h>
 #endif  // defined(OS_IOS)
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "crypto/sha2.h"
 #include "device/bluetooth/bluetooth_device_mac.h"
 
 namespace device {
 
 class BluetoothLowEnergyDiscoverManagerMac;
 
 class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
     : public BluetoothDeviceMac {
  public:
   BluetoothLowEnergyDeviceMac(CBPeripheral* peripheral,
-                              NSDictionary* advertisement_data,
+                              NSDictionary* advertisementData,
                               int rssi);
   ~BluetoothLowEnergyDeviceMac() override;
 
   int GetRSSI() const;
 
   // BluetoothDevice overrides.
   std::string GetIdentifier() const override;
   uint32 GetBluetoothClass() const override;
   std::string GetAddress() const override;
   BluetoothDevice::VendorIDSource GetVendorIDSource() const override;
@@ skipping 36 matching lines @@
 
   // BluetoothDeviceMac override.
   NSDate* GetLastUpdateTime() const override;
 
  protected:
   // BluetoothDevice override.
   std::string GetDeviceName() const override;
 
   // Updates information about the device.
   virtual void Update(CBPeripheral* peripheral,
-                      NSDictionary* advertisement_data,
+                      NSDictionary* advertisementData,
                       int rssi);
 
   static std::string GetPeripheralIdentifier(CBPeripheral* peripheral);
 
   // Hashes and truncates the peripheral identifier to deterministically
   // construct an address. The use of fake addresses is a temporary fix before
   // we switch to using bluetooth identifiers throughout Chrome.
   // http://crbug.com/507824
   static std::string GetPeripheralHashAddress(CBPeripheral* peripheral);
 
@@ skipping 16 matching lines @@
   // The peripheral's identifier, as returned by [CBPeripheral identifier].
   std::string identifier_;
 
   // A local address for the device created by hashing the peripheral
   // identifier.
   std::string hash_address_;
 
   // Stores the time of the most recent call to Update().
   base::scoped_nsobject<NSDate> last_update_time_;
 
-  // The services (identified by UUIDs) that this device provides.
-  UUIDList advertised_uuids_;
-
   DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDeviceMac);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_