| Index: components/proximity_auth/bluetooth_connection.h
|
| diff --git a/components/proximity_auth/bluetooth_connection.h b/components/proximity_auth/bluetooth_connection.h
|
| index ccebdbd835ad3dce602dacba55bf14c05c7d5199..4099f57fa02d6109372c61219a1f5fcb9e3a62b2 100644
|
| --- a/components/proximity_auth/bluetooth_connection.h
|
| +++ b/components/proximity_auth/bluetooth_connection.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "components/proximity_auth/connection.h"
|
| +#include "components/cryptauth/connection.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| #include "device/bluetooth/bluetooth_socket.h"
|
| @@ -28,7 +28,7 @@ namespace proximity_auth {
|
|
|
| // Represents a Bluetooth connection with a remote device. The connection is a
|
| // persistent bidirectional channel for sending and receiving wire messages.
|
| -class BluetoothConnection : public Connection,
|
| +class BluetoothConnection : public cryptauth::Connection,
|
| public device::BluetoothAdapter::Observer {
|
| public:
|
| // Constructs a Bluetooth connection to the service with |uuid| on the
|
| @@ -44,7 +44,8 @@ class BluetoothConnection : public Connection,
|
|
|
| protected:
|
| // Connection:
|
| - void SendMessageImpl(std::unique_ptr<WireMessage> message) override;
|
| + void SendMessageImpl(
|
| + std::unique_ptr<cryptauth::WireMessage> message) override;
|
|
|
| // BluetoothAdapter::Observer:
|
| void DeviceChanged(device::BluetoothAdapter* adapter,
|
| @@ -80,7 +81,7 @@ class BluetoothConnection : public Connection,
|
|
|
| // The message that was sent over the backing |socket_|. NULL iff there is no
|
| // send operation in progress.
|
| - std::unique_ptr<WireMessage> pending_message_;
|
| + std::unique_ptr<cryptauth::WireMessage> pending_message_;
|
|
|
| base::WeakPtrFactory<BluetoothConnection> weak_ptr_factory_;
|
|
|
|
|