| Index: chromeos/dbus/fake_bluetooth_profile_service_provider.h
|
| diff --git a/chromeos/dbus/fake_bluetooth_profile_service_provider.h b/chromeos/dbus/fake_bluetooth_profile_service_provider.h
|
| index 95a88c5c47f90f869d2f34533fb648e41fb84ae4..1466a7ed6cf408161428fbaef67af5ea7d076693 100644
|
| --- a/chromeos/dbus/fake_bluetooth_profile_service_provider.h
|
| +++ b/chromeos/dbus/fake_bluetooth_profile_service_provider.h
|
| @@ -18,28 +18,28 @@ namespace chromeos {
|
| // FakeBluetoothProfileServiceProvider simulates the behavior of a local
|
| // Bluetooth agent object and is used both in test cases in place of a
|
| // mock and on the Linux desktop.
|
| +//
|
| +// This class is only called from the dbus origin thread and is not thread-safe.
|
| class CHROMEOS_EXPORT FakeBluetoothProfileServiceProvider
|
| : public BluetoothProfileServiceProvider {
|
| public:
|
| FakeBluetoothProfileServiceProvider(const dbus::ObjectPath& object_path,
|
| - Delegate *delegate);
|
| + Delegate* delegate);
|
| ~FakeBluetoothProfileServiceProvider() override;
|
|
|
| // Each of these calls the equivalent
|
| // BluetoothProfileServiceProvider::Delegate method on the object passed on
|
| // construction.
|
| - virtual void Release();
|
| - virtual void NewConnection(
|
| - const dbus::ObjectPath& device_path,
|
| - scoped_ptr<dbus::FileDescriptor> fd,
|
| - const Delegate::Options& options,
|
| - const Delegate::ConfirmationCallback& callback);
|
| - virtual void RequestDisconnection(
|
| - const dbus::ObjectPath& device_path,
|
| - const Delegate::ConfirmationCallback& callback);
|
| - virtual void Cancel();
|
| -
|
| - const dbus::ObjectPath& object_path() { return object_path_; }
|
| + void Released();
|
| + void NewConnection(const dbus::ObjectPath& device_path,
|
| + scoped_ptr<dbus::FileDescriptor> fd,
|
| + const Delegate::Options& options,
|
| + const Delegate::ConfirmationCallback& callback);
|
| + void RequestDisconnection(const dbus::ObjectPath& device_path,
|
| + const Delegate::ConfirmationCallback& callback);
|
| + void Cancel();
|
| +
|
| + const dbus::ObjectPath& object_path() const { return object_path_; }
|
|
|
| private:
|
| friend class FakeBluetoothProfileManagerClient;
|
| @@ -51,8 +51,11 @@ class CHROMEOS_EXPORT FakeBluetoothProfileServiceProvider
|
| // passed to generate the reply. |delegate_| is generally the object that
|
| // owns this one, and must outlive it.
|
| Delegate* delegate_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(FakeBluetoothProfileServiceProvider);
|
| };
|
|
|
| } // namespace chromeos
|
|
|
| #endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
| +
|
|
|