arc: bluetooth: Remove Get/SetRemote.*

A relevant patch is ag/5473995.

Bug: b:111367421
Test: build
Change-Id: Icdf9cf1dcd6b391ef4190c4fac89c00ef3fddb54
Reviewed-on: https://chromium-review.googlesource.com/c/1327332Reviewed-by: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Commit-Queue: Qiyu Hu <qiyuh@google.com>
Cr-Commit-Position: refs/heads/master@{#606935}

chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc

@@ -1060,58 +1060,6 @@ void ArcBluetoothBridge::SetAdapterProperty(
   }
 }
 
-void ArcBluetoothBridge::GetRemoteDeviceProperty(
-    mojom::BluetoothAddressPtr remote_addr,
-    mojom::BluetoothPropertyType type) {
-  DCHECK(bluetooth_adapter_);
-  auto* bluetooth_instance = ARC_GET_INSTANCE_FOR_METHOD(
-      arc_bridge_service_->bluetooth(), OnRemoteDeviceProperties);
-  if (!bluetooth_instance)
-    return;
-
-  std::string addr_str = remote_addr->To<std::string>();
-  BluetoothDevice* device = bluetooth_adapter_->GetDevice(addr_str);
-
-  std::vector<mojom::BluetoothPropertyPtr> properties =
-      GetDeviceProperties(type, device);
-  mojom::BluetoothStatus status = mojom::BluetoothStatus::SUCCESS;
-
-  if (!device) {
-    VLOG(1) << __func__ << ": device " << addr_str << " not available";
-    status = mojom::BluetoothStatus::FAIL;
-  }
-
-  bluetooth_instance->OnRemoteDeviceProperties(status, std::move(remote_addr),
-                                               std::move(properties));
-}
-
-void ArcBluetoothBridge::SetRemoteDeviceProperty(
-    mojom::BluetoothAddressPtr remote_addr,
-    mojom::BluetoothPropertyPtr property) {
-  DCHECK(bluetooth_adapter_);
-  auto* bluetooth_instance = ARC_GET_INSTANCE_FOR_METHOD(
-      arc_bridge_service_->bluetooth(), OnRemoteDeviceProperties);
-  if (!bluetooth_instance)
-    return;
-
-  // Unsupported. Only used by Android hidden API, BluetoothDevice.SetAlias().
-  // And only Android Settings App / Android TV / NFC used that.
-  bluetooth_instance->OnRemoteDeviceProperties(
-      mojom::BluetoothStatus::UNSUPPORTED, std::move(remote_addr),
-      std::vector<mojom::BluetoothPropertyPtr>());
-}
-
-void ArcBluetoothBridge::GetRemoteServiceRecord(
-    mojom::BluetoothAddressPtr remote_addr,
-    const BluetoothUUID& uuid) {
-  // TODO(smbarber): Implement GetRemoteServiceRecord
-}
-
-void ArcBluetoothBridge::GetRemoteServices(
-    mojom::BluetoothAddressPtr remote_addr) {
-  // TODO(smbarber): Implement GetRemoteServices
-}
-
 void ArcBluetoothBridge::StartDiscovery() {
   discovery_queue_.Push(base::BindOnce(&ArcBluetoothBridge::StartDiscoveryImpl,
                                        weak_factory_.GetWeakPtr(), false));

chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h

@@ -197,15 +197,6 @@ class ArcBluetoothBridge
   void GetAdapterProperty(mojom::BluetoothPropertyType type) override;
   void SetAdapterProperty(mojom::BluetoothPropertyPtr property) override;
 
-  void GetRemoteDeviceProperty(mojom::BluetoothAddressPtr remote_addr,
-                               mojom::BluetoothPropertyType type) override;
-  void SetRemoteDeviceProperty(mojom::BluetoothAddressPtr remote_addr,
-                               mojom::BluetoothPropertyPtr property) override;
-  void GetRemoteServiceRecord(mojom::BluetoothAddressPtr remote_addr,
-                              const device::BluetoothUUID& uuid) override;
-
-  void GetRemoteServices(mojom::BluetoothAddressPtr remote_addr) override;
-
   void StartDiscovery() override;
   void CancelDiscovery() override;
 

components/arc/common/bluetooth.mojom

@@ -293,19 +293,12 @@ struct BluetoothCreateSdpRecordResult {
 };
 
 // Next Method ID: 45
-// Deprecated method ID: 20, 21
+// Deprecated Method ID: 4, 5, 6, 7, 20, 21
 interface BluetoothHost {
   EnableAdapter@0() => (BluetoothAdapterState state);
   DisableAdapter@1() => (BluetoothAdapterState state);
   GetAdapterProperty@2(BluetoothPropertyType type);
   SetAdapterProperty@3(BluetoothProperty property);
-  GetRemoteDeviceProperty@4(BluetoothAddress remote_addr,
-                            BluetoothPropertyType type);
-  SetRemoteDeviceProperty@5(BluetoothAddress remote_addr,
-                            BluetoothProperty property);
-  GetRemoteServiceRecord@6(BluetoothAddress remote_addr,
-                           BluetoothUUID uuid);
-  GetRemoteServices@7(BluetoothAddress remote_addr);
   StartDiscovery@8();
   CancelDiscovery@9();
   CreateBond@10(BluetoothAddress addr, int32 transport);
@@ -409,6 +402,7 @@ interface BluetoothHost {
 };
 
 // Next Method ID: 21
+// Deprecated Method ID: 2
 interface BluetoothInstance {
   // DEPRECATED: Please use Init@18 instead.
   InitDeprecated@0(BluetoothHost host_ptr);
@@ -418,9 +412,6 @@ interface BluetoothInstance {
 
   OnAdapterProperties@1(BluetoothStatus status,
                         array<BluetoothProperty> properties);
-  OnRemoteDeviceProperties@2(BluetoothStatus status,
-                             BluetoothAddress address,
-                             array<BluetoothProperty> properties);
   OnDeviceFound@3(array<BluetoothProperty> properties);
   OnDiscoveryStateChanged@4(BluetoothDiscoveryState state);
   OnBondStateChanged@5(BluetoothStatus status,

components/arc/test/fake_bluetooth_instance.cc

@@ -42,11 +42,6 @@ void FakeBluetoothInstance::OnAdapterProperties(
     mojom::BluetoothStatus status,
     std::vector<mojom::BluetoothPropertyPtr> properties) {}
 
-void FakeBluetoothInstance::OnRemoteDeviceProperties(
-    mojom::BluetoothStatus status,
-    mojom::BluetoothAddressPtr address,
-    std::vector<mojom::BluetoothPropertyPtr> properties) {}
-
 void FakeBluetoothInstance::OnDeviceFound(
     std::vector<mojom::BluetoothPropertyPtr> properties) {
   device_found_data_.push_back(std::move(properties));

components/arc/test/fake_bluetooth_instance.h

@@ -74,10 +74,6 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
   void OnAdapterProperties(
       mojom::BluetoothStatus status,
       std::vector<mojom::BluetoothPropertyPtr> properties) override;
-  void OnRemoteDeviceProperties(
-      mojom::BluetoothStatus status,
-      mojom::BluetoothAddressPtr address,
-      std::vector<mojom::BluetoothPropertyPtr> properties) override;
   void OnDeviceFound(
       std::vector<mojom::BluetoothPropertyPtr> properties) override;
   void OnDiscoveryStateChanged(mojom::BluetoothDiscoveryState state) override;