Revert of Bluetooth: Add service data unit tests for chromeos

device/bluetooth/dbus/fake_bluetooth_device_client.cc

 // Copyright (c) 2013 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/dbus/fake_bluetooth_device_client.h"
 
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ skipping 1533 matching lines @@
   if (iter == properties_map_.end()) {
     VLOG(2) << "Fake device does not exist: " << object_path.value();
     return;
   }
   Properties* properties = iter->second.get();
   DCHECK(properties);
   properties->rssi.set_valid(true);
   properties->rssi.ReplaceValue(rssi);
 }
 
-void FakeBluetoothDeviceClient::UpdateServiceData(
-    const dbus::ObjectPath& object_path,
-    const std::unordered_map<std::string, std::vector<uint8_t>>& service_data) {
-  PropertiesMap::const_iterator iter = properties_map_.find(object_path);
-  if (iter == properties_map_.end()) {
-    VLOG(2) << "Fake device does not exist: " << object_path.value();
-    return;
-  }
-  Properties* properties = iter->second.get();
-  DCHECK(properties);
-  properties->service_data.set_valid(true);
-
-  // BlueZ caches all the previously received advertisements. To mimic BlueZ
-  // caching behavior, merge the new data here with the existing data.
-  // TODO(crbug.com/707039): once the BlueZ caching behavior is changed, this
-  // needs to be updated as well.
-  std::unordered_map<std::string, std::vector<uint8_t>> merged_data =
-      service_data;
-  merged_data.insert(properties->service_data.value().begin(),
-                     properties->service_data.value().end());
-  properties->service_data.ReplaceValue(merged_data);
-}
-
 void FakeBluetoothDeviceClient::UpdateConnectionInfo(
     uint16_t connection_rssi,
     uint16_t transmit_power,
     uint16_t max_transmit_power) {
   connection_rssi_ = connection_rssi;
   transmit_power_ = transmit_power;
   max_transmit_power_ = max_transmit_power;
 }
 
 void FakeBluetoothDeviceClient::PinCodeCallback(
@@ skipping 204 matching lines @@
 void FakeBluetoothDeviceClient::RemoveAllDevices() {
   device_list_.clear();
 }
 
 void FakeBluetoothDeviceClient::CreateTestDevice(
     const dbus::ObjectPath& adapter_path,
     const base::Optional<std::string> name,
     const std::string alias,
     const std::string device_address,
     const std::vector<std::string>& service_uuids,
-    device::BluetoothTransport type,
-    const std::unordered_map<std::string, std::vector<uint8_t>>& service_data) {
+    device::BluetoothTransport type) {
   // Create a random device path.
   dbus::ObjectPath device_path;
   std::string id;
   do {
     // Construct an id that is valid according to the DBUS specification.
     base::Base64Encode(base::RandBytesAsString(10), &id);
     base::RemoveChars(id, "+/=", &id);
     device_path = dbus::ObjectPath(adapter_path.value() + "/dev" + id);
   } while (std::find(device_list_.begin(), device_list_.end(), device_path) !=
            device_list_.end());
@@ skipping 22 matching lines @@
       properties->type.ReplaceValue(BluetoothDeviceClient::kTypeLe);
       break;
     case device::BLUETOOTH_TRANSPORT_DUAL:
       properties->type.ReplaceValue(BluetoothDeviceClient::kTypeDual);
       break;
     default:
       NOTREACHED();
   }
   properties->type.set_valid(true);
 
-  if (!service_data.empty()) {
-    properties->service_data.ReplaceValue(service_data);
-    properties->service_data.set_valid(true);
-  }
-
   properties_map_.insert(std::make_pair(device_path, std::move(properties)));
   device_list_.push_back(device_path);
   for (auto& observer : observers_)
     observer.DeviceAdded(device_path);
 }
 
 }  // namespace bluez