Revert of Bluetooth: Add service data unit tests for chromeos

device/bluetooth/test/bluetooth_test_bluez.cc

 // 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_bluez.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 104 matching lines @@
 
 BluetoothDevice* BluetoothTestBlueZ::SimulateLowEnergyDevice(
     int device_ordinal) {
   if (device_ordinal > 6 || device_ordinal < 1)
     return nullptr;
 
   base::Optional<std::string> device_name = kTestDeviceName;
   std::string device_address = kTestDeviceAddress1;
   std::vector<std::string> service_uuids;
   BluetoothTransport device_type = BLUETOOTH_TRANSPORT_LE;
-  std::unordered_map<std::string, std::vector<uint8_t>> service_data;
 
   switch (device_ordinal) {
     case 1:
       service_uuids.push_back(kTestUUIDGenericAccess);
       service_uuids.push_back(kTestUUIDGenericAttribute);
-      service_data[kTestUUIDHeartRate] = {0x01};
       break;
     case 2:
       service_uuids.push_back(kTestUUIDImmediateAlert);
       service_uuids.push_back(kTestUUIDLinkLoss);
-      service_data[kTestUUIDHeartRate] = {};
-      service_data[kTestUUIDImmediateAlert] = {0x00, 0x02};
       break;
     case 3:
       device_name = kTestDeviceNameEmpty;
       break;
     case 4:
       device_name = kTestDeviceNameEmpty;
       device_address = kTestDeviceAddress2;
       break;
     case 5:
       device_name = base::nullopt;
     case 6:
       device_address = kTestDeviceAddress2;
       device_type = BLUETOOTH_TRANSPORT_DUAL;
       break;
   }
 
+  if (!adapter_->GetDevice(device_address)) {
+    fake_bluetooth_device_client_->CreateTestDevice(
+        dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
+        /* name */ device_name,
+        /* alias */ device_name.value_or("") + "(alias)", device_address,
+        service_uuids, device_type);
+  }
   BluetoothDevice* device = adapter_->GetDevice(device_address);
-  if (device) {
-    fake_bluetooth_device_client_->UpdateServiceData(GetDevicePath(device),
-                                                     service_data);
-    return device;
-  }
 
-  fake_bluetooth_device_client_->CreateTestDevice(
-      dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
-      /* name */ device_name,
-      /* alias */ device_name.value_or("") + "(alias)", device_address,
-      service_uuids, device_type, service_data);
-
-  return adapter_->GetDevice(device_address);
+  return device;
 }
 
 BluetoothDevice* BluetoothTestBlueZ::SimulateClassicDevice() {
   std::string device_name = kTestDeviceName;
   std::string device_address = kTestDeviceAddress3;
   std::vector<std::string> service_uuids;
-  std::unordered_map<std::string, std::vector<uint8_t>> service_data;
 
   if (!adapter_->GetDevice(device_address)) {
     fake_bluetooth_device_client_->CreateTestDevice(
         dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
         device_name /* name */, device_name /* alias */, device_address,
-        service_uuids, BLUETOOTH_TRANSPORT_CLASSIC, service_data);
+        service_uuids, BLUETOOTH_TRANSPORT_CLASSIC);
   }
   return adapter_->GetDevice(device_address);
 }
 
 void BluetoothTestBlueZ::SimulateLocalGattCharacteristicValueReadRequest(
     BluetoothDevice* from_device,
     BluetoothLocalGattCharacteristic* characteristic,
     const BluetoothLocalGattService::Delegate::ValueCallback& value_callback,
     const base::Closure& error_callback) {
   bluez::BluetoothLocalGattCharacteristicBlueZ* characteristic_bluez =
@@ skipping 159 matching lines @@
   std::vector<BluetoothLocalGattService*> services;
   bluez::BluetoothAdapterBlueZ* adapter_bluez =
       static_cast<bluez::BluetoothAdapterBlueZ*>(adapter_.get());
 
   for (const auto& iter : adapter_bluez->registered_gatt_services_)
     services.push_back(iter.second);
   return services;
 }
 
 }  // namespace device