Revert of bluetooth: mac: Initial BluetoothRemoteGattCharacteristicMac implementation

device/bluetooth/test/bluetooth_test_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/test/bluetooth_test_mac.h"
 
 #include <stdint.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_adapter_mac.h"
-#include "device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_mac.h"
-#include "device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.h"
 #include "device/bluetooth/test/mock_bluetooth_cbperipheral_mac.h"
-#include "device/bluetooth/test/mock_bluetooth_cbservice_mac.h"
 #include "device/bluetooth/test/mock_bluetooth_central_manager_mac.h"
 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h"
 #include "third_party/ocmock/OCMock/OCMock.h"
 
 #import <CoreBluetooth/CoreBluetooth.h>
 
 using base::mac::ObjCCast;
 using base::scoped_nsobject;
 
-namespace {
-
-void DidDiscoverServices(MockCBPeripheral* peripheral_mock) {
-  [peripheral_mock didDiscoverServicesWithError:nil];
-  // BluetoothLowEnergyDeviceMac is expected to call
-  // -[CBPeripheral discoverCharacteristics:forService:] for each services,
-  // so -[<CBPeripheralDelegate peripheral:didDiscoverCharacteristicsForService:
-  // error:] needs to be called
-  [peripheral_mock didDiscoverCharactericsForAllServices];
-}
-}  // namespace
-
 namespace device {
 
 // This class hides Objective-C from bluetooth_test_mac.h.
 class BluetoothTestMac::ScopedMockCentralManager {
  public:
   explicit ScopedMockCentralManager(MockCentralManager* mock_central_manager) {
     mock_central_manager_.reset(mock_central_manager);
   }
 
   // Returns MockCentralManager instance.
@@ skipping 196 matching lines @@
   BluetoothLowEnergyDeviceMac* device_mac =
       static_cast<BluetoothLowEnergyDeviceMac*>(device);
   CBPeripheral* peripheral = device_mac->GetPeripheral();
   MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
   scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
   for (auto uuid : uuids) {
     CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
     [services addObject:cb_service_uuid];
   }
   [peripheral_mock addServices:services];
-  DidDiscoverServices(peripheral_mock);
+  [peripheral_mock didDiscoverServicesWithError:nil];
 }
 
 void BluetoothTestMac::SimulateGattServiceRemoved(
     BluetoothRemoteGattService* service) {
   BluetoothUUID bluetooth_service_uuid = service->GetUUID();
   std::string service_uuid_string = bluetooth_service_uuid.canonical_value();
   BluetoothRemoteGattServiceMac* mac_gatt_service =
       static_cast<BluetoothRemoteGattServiceMac*>(service);
   BluetoothDevice* device = service->GetDevice();
   BluetoothLowEnergyDeviceMac* device_mac =
       static_cast<BluetoothLowEnergyDeviceMac*>(device);
   CBPeripheral* peripheral = device_mac->GetPeripheral();
   MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
   [peripheral_mock removeService:mac_gatt_service->GetService()];
-  // After -[MockCBPeripheral removeService:], BluetoothLowEnergyDeviceMac is
-  // expected to call -[CBPeripheral discoverServices:]
-  DidDiscoverServices(peripheral_mock);
-}
-
-void BluetoothTestMac::SimulateGattCharacteristic(
-    BluetoothRemoteGattService* service,
-    const std::string& uuid,
-    int properties) {
-  BluetoothRemoteGattServiceMac* mac_gatt_service =
-      static_cast<BluetoothRemoteGattServiceMac*>(service);
-  CBService* cb_service = mac_gatt_service->GetService();
-  MockCBService* service_mock = ObjCCast<MockCBService>(cb_service);
-  CBUUID* cb_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
-  [service_mock addCharacteristicWithUUID:cb_uuid properties:properties];
-  MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(service);
-  [peripheral_mock didModifyServices:@[]];
-  // After -[MockCBPeripheral didModifyServices:], BluetoothLowEnergyDeviceMac
-  // is expected to call -[CBPeripheral discoverServices:]
-  DidDiscoverServices(peripheral_mock);
-}
-
-void BluetoothTestMac::SimulateGattCharacteristicRemoved(
-    BluetoothRemoteGattService* service,
-    BluetoothRemoteGattCharacteristic* characteristic) {
-  MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(service);
-  BluetoothRemoteGattServiceMac* mac_gatt_service =
-      static_cast<BluetoothRemoteGattServiceMac*>(service);
-  CBService* cb_service = mac_gatt_service->GetService();
-  MockCBService* service_mock = ObjCCast<MockCBService>(cb_service);
-  BluetoothRemoteGattCharacteristicMac* characteristic_mac =
-      static_cast<BluetoothRemoteGattCharacteristicMac*>(characteristic);
-  CBCharacteristic* cb_characteristic =
-      characteristic_mac->GetCBCharacteristic();
-  MockCBCharacteristic* characteristic_mock =
-      ObjCCast<MockCBCharacteristic>(cb_characteristic);
-  [service_mock removeCharacteristicMock:characteristic_mock];
-  DidDiscoverServices(peripheral_mock);
+  [peripheral_mock didDiscoverServicesWithError:nil];
 }
 
 void BluetoothTestMac::OnFakeBluetoothDeviceConnectGattCalled() {
   gatt_connection_attempts_++;
 }
 
 void BluetoothTestMac::OnFakeBluetoothGattDisconnect() {
   gatt_disconnection_attempts_++;
 }
 
 void BluetoothTestMac::OnFakeBluetoothServiceDiscovery() {
   gatt_discovery_attempts_++;
 }
 
-MockCBPeripheral* BluetoothTestMac::GetMockCBPeripheral(
-    BluetoothRemoteGattService* service) const {
-  BluetoothDevice* device = service->GetDevice();
-  BluetoothLowEnergyDeviceMac* device_mac =
-      static_cast<BluetoothLowEnergyDeviceMac*>(device);
-  CBPeripheral* cb_peripheral = device_mac->GetPeripheral();
-  return ObjCCast<MockCBPeripheral>(cb_peripheral);
-}
-
 // Utility function for generating new (CBUUID, address) pairs where CBUUID
 // hashes to address. For use when adding a new device address to the testing
 // suite because CoreBluetooth peripherals have CBUUIDs in place of addresses,
 // and we construct fake addresses for them by hashing the CBUUID. By changing
 // |target| the user can generate sequentially numbered test addresses.
 //
 // std::string BluetoothTestMac::FindCBUUIDForHashTarget() {
 //   // The desired first 6 digits of the hash.  For example 0100000, 020000,
 //   // 030000, ...
 //   const std::string target = "010000";
@@ skipping 16 matching lines @@
 //     crypto::SHA256HashString(input_str, raw, sizeof(raw));
 //     if (base::HexEncode(raw, sizeof(raw)) == target) {
 //       return input_str;
 //     }
 //     ++input[0];
 //   }
 //   return "";
 // }
 
 }  // namespace device