Revert of Bluetooth: Add service data unit tests for chromeos

device/bluetooth/dbus/fake_bluetooth_device_client.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_
 #define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_
 
 #include <cstdint>
 #include <map>
 #include <memory>
@@ skipping 138 matching lines @@
   // by GetConnInfo.
   void UpdateConnectionInfo(uint16_t connection_rssi,
                             uint16_t transmit_power,
                             uint16_t max_transmit_power);
 
   // Test specific functions:
   // Remove all test devices from this client.
   void RemoveAllDevices();
 
   // Create a test Bluetooth device with the given properties.
-  void 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);
+  void 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);
 
   void set_delay_start_discovery(bool value) { delay_start_discovery_ = value; }
 
   // Updates the inquiry RSSI property of fake device with object path
   // |object_path| to |rssi|, if the fake device exists.
   void UpdateDeviceRSSI(const dbus::ObjectPath& object_path, int16_t rssi);
 
-  // Updates the service data property of fake device with object path
-  // |object_path| to merge |service_data| into the existing data,
-  // if the fake device exists.
-  void UpdateServiceData(
-      const dbus::ObjectPath& object_path,
-      const std::unordered_map<std::string, std::vector<uint8_t>>&
-          service_data);
-
   static const char kTestPinCode[];
   static const int kTestPassKey;
 
   static const char kPairingMethodNone[];
   static const char kPairingMethodPinCode[];
   static const char kPairingMethodPassKey[];
 
   static const char kPairingActionConfirmation[];
   static const char kPairingActionDisplay[];
   static const char kPairingActionFail[];
@@ skipping 163 matching lines @@
   int16_t max_transmit_power_;
 
   // Controls the fake behavior to allow more extensive UI testing without
   // having to cycle the discovery simulation.
   bool delay_start_discovery_;
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_