Remove service, add device, in BluetoothLocalGattService::Delegate

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 "base/bind.h"
 #include "base/callback.h"
@@ skipping 106 matching lines @@
         dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
         device_name /* name */, device_name /* alias */, device_address,
         service_uuids);
   }
   BluetoothDevice* device = adapter_->GetDevice(device_address);
 
   return device;
 }
 
 void BluetoothTestBlueZ::SimulateLocalGattCharacteristicValueReadRequest(
-    BluetoothLocalGattService* service,
     BluetoothLocalGattCharacteristic* characteristic,
     const BluetoothLocalGattService::Delegate::ValueCallback& value_callback,
     const base::Closure& error_callback) {
   bluez::BluetoothLocalGattCharacteristicBlueZ* characteristic_bluez =
       static_cast<bluez::BluetoothLocalGattCharacteristicBlueZ*>(
           characteristic);
   bluez::FakeBluetoothGattManagerClient* fake_bluetooth_gatt_manager_client =
       static_cast<bluez::FakeBluetoothGattManagerClient*>(
           bluez::BluezDBusManager::Get()->GetBluetoothGattManagerClient());
   bluez::FakeBluetoothGattCharacteristicServiceProvider*
       characteristic_provider =
           fake_bluetooth_gatt_manager_client->GetCharacteristicServiceProvider(
               characteristic_bluez->object_path());
 
   bluez::BluetoothLocalGattServiceBlueZ* service_bluez =
-      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(service);
+      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(
+          characteristic->GetService());
   static_cast<TestBluetoothLocalGattServiceDelegate*>(
       service_bluez->GetDelegate())
       ->set_expected_characteristic(characteristic);
 
   base::RunLoop run_loop;
   characteristic_provider->GetValue(
       base::Bind(&GetValueCallback, run_loop.QuitClosure(), value_callback),
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), error_callback));
   run_loop.Run();
 }
 
 void BluetoothTestBlueZ::SimulateLocalGattCharacteristicValueWriteRequest(
-    BluetoothLocalGattService* service,
     BluetoothLocalGattCharacteristic* characteristic,
     const std::vector<uint8_t>& value_to_write,
     const base::Closure& success_callback,
     const base::Closure& error_callback) {
   bluez::BluetoothLocalGattCharacteristicBlueZ* characteristic_bluez =
       static_cast<bluez::BluetoothLocalGattCharacteristicBlueZ*>(
           characteristic);
   bluez::FakeBluetoothGattManagerClient* fake_bluetooth_gatt_manager_client =
       static_cast<bluez::FakeBluetoothGattManagerClient*>(
           bluez::BluezDBusManager::Get()->GetBluetoothGattManagerClient());
   bluez::FakeBluetoothGattCharacteristicServiceProvider*
       characteristic_provider =
           fake_bluetooth_gatt_manager_client->GetCharacteristicServiceProvider(
               characteristic_bluez->object_path());
 
   bluez::BluetoothLocalGattServiceBlueZ* service_bluez =
-      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(service);
+      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(
+          characteristic->GetService());
   static_cast<TestBluetoothLocalGattServiceDelegate*>(
       service_bluez->GetDelegate())
       ->set_expected_characteristic(characteristic);
 
   base::RunLoop run_loop;
   characteristic_provider->SetValue(
       value_to_write,
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), success_callback),
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), error_callback));
   run_loop.Run();
 }
 
 void BluetoothTestBlueZ::SimulateLocalGattDescriptorValueReadRequest(
-    BluetoothLocalGattService* service,
     BluetoothLocalGattDescriptor* descriptor,
     const BluetoothLocalGattService::Delegate::ValueCallback& value_callback,
     const base::Closure& error_callback) {
   bluez::BluetoothLocalGattDescriptorBlueZ* descriptor_bluez =
       static_cast<bluez::BluetoothLocalGattDescriptorBlueZ*>(descriptor);
   bluez::FakeBluetoothGattManagerClient* fake_bluetooth_gatt_manager_client =
       static_cast<bluez::FakeBluetoothGattManagerClient*>(
           bluez::BluezDBusManager::Get()->GetBluetoothGattManagerClient());
   bluez::FakeBluetoothGattDescriptorServiceProvider* descriptor_provider =
       fake_bluetooth_gatt_manager_client->GetDescriptorServiceProvider(
           descriptor_bluez->object_path());
 
   bluez::BluetoothLocalGattServiceBlueZ* service_bluez =
-      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(service);
+      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(
+          descriptor->GetCharacteristic()->GetService());
   static_cast<TestBluetoothLocalGattServiceDelegate*>(
       service_bluez->GetDelegate())
       ->set_expected_descriptor(descriptor);
 
   base::RunLoop run_loop;
   descriptor_provider->GetValue(
       base::Bind(&GetValueCallback, run_loop.QuitClosure(), value_callback),
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), error_callback));
   run_loop.Run();
 }
 
 void BluetoothTestBlueZ::SimulateLocalGattDescriptorValueWriteRequest(
-    BluetoothLocalGattService* service,
     BluetoothLocalGattDescriptor* descriptor,
     const std::vector<uint8_t>& value_to_write,
     const base::Closure& success_callback,
     const base::Closure& error_callback) {
   bluez::BluetoothLocalGattDescriptorBlueZ* descriptor_bluez =
       static_cast<bluez::BluetoothLocalGattDescriptorBlueZ*>(descriptor);
   bluez::FakeBluetoothGattManagerClient* fake_bluetooth_gatt_manager_client =
       static_cast<bluez::FakeBluetoothGattManagerClient*>(
           bluez::BluezDBusManager::Get()->GetBluetoothGattManagerClient());
   bluez::FakeBluetoothGattDescriptorServiceProvider* descriptor_provider =
       fake_bluetooth_gatt_manager_client->GetDescriptorServiceProvider(
           descriptor_bluez->object_path());
 
   bluez::BluetoothLocalGattServiceBlueZ* service_bluez =
-      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(service);
+      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(
+          descriptor->GetCharacteristic()->GetService());
   static_cast<TestBluetoothLocalGattServiceDelegate*>(
       service_bluez->GetDelegate())
       ->set_expected_descriptor(descriptor);
 
   base::RunLoop run_loop;
   descriptor_provider->SetValue(
       value_to_write,
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), success_callback),
       base::Bind(&ClosureCallback, run_loop.QuitClosure(), error_callback));
   run_loop.Run();
 }
 
 bool BluetoothTestBlueZ::SimulateLocalGattCharacteristicNotificationsRequest(
-    BluetoothLocalGattService* service,
     BluetoothLocalGattCharacteristic* characteristic,
     bool start) {
   bluez::BluetoothLocalGattCharacteristicBlueZ* characteristic_bluez =
       static_cast<bluez::BluetoothLocalGattCharacteristicBlueZ*>(
           characteristic);
   bluez::FakeBluetoothGattManagerClient* fake_bluetooth_gatt_manager_client =
       static_cast<bluez::FakeBluetoothGattManagerClient*>(
           bluez::BluezDBusManager::Get()->GetBluetoothGattManagerClient());
   bluez::FakeBluetoothGattCharacteristicServiceProvider*
       characteristic_provider =
           fake_bluetooth_gatt_manager_client->GetCharacteristicServiceProvider(
               characteristic_bluez->object_path());
 
   bluez::BluetoothLocalGattServiceBlueZ* service_bluez =
-      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(service);
+      static_cast<bluez::BluetoothLocalGattServiceBlueZ*>(
+          characteristic->GetService());
   static_cast<TestBluetoothLocalGattServiceDelegate*>(
       service_bluez->GetDelegate())
       ->set_expected_characteristic(characteristic);
 
   return characteristic_provider->NotificationsChange(start);
 }
 
 std::vector<uint8_t> BluetoothTestBlueZ::LastNotifactionValueForCharacteristic(
     BluetoothLocalGattCharacteristic* characteristic) {
   bluez::BluetoothLocalGattCharacteristicBlueZ* characteristic_bluez =
@@ skipping 16 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