Index: components/proximity_auth/bluetooth_connection_finder.h |
diff --git a/components/proximity_auth/bluetooth_connection_finder.h b/components/proximity_auth/bluetooth_connection_finder.h |
index a2f5ee749b4000d8d62048514aa5ae146e7fb355..6265f0d68d6c1715403a8d5174b53910e0fcf27c 100644 |
--- a/components/proximity_auth/bluetooth_connection_finder.h |
+++ b/components/proximity_auth/bluetooth_connection_finder.h |
@@ -12,10 +12,11 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/weak_ptr.h" |
#include "base/time/time.h" |
+#include "components/cryptauth/connection.h" |
+#include "components/cryptauth/connection_observer.h" |
#include "components/cryptauth/remote_device.h" |
#include "components/proximity_auth/bluetooth_util.h" |
#include "components/proximity_auth/connection_finder.h" |
-#include "components/proximity_auth/connection_observer.h" |
#include "device/bluetooth/bluetooth_adapter.h" |
#include "device/bluetooth/bluetooth_uuid.h" |
@@ -24,7 +25,7 @@ namespace proximity_auth { |
// This ConnectionFinder implementation tries to find a Bluetooth connection to |
// the remote device by polling at a fixed interval. |
class BluetoothConnectionFinder : public ConnectionFinder, |
- public ConnectionObserver, |
+ public cryptauth::ConnectionObserver, |
public device::BluetoothAdapter::Observer { |
public: |
BluetoothConnectionFinder(const cryptauth::RemoteDevice& remote_device, |
@@ -37,7 +38,7 @@ class BluetoothConnectionFinder : public ConnectionFinder, |
protected: |
// Exposed for mocking out the connection in tests. |
- virtual std::unique_ptr<Connection> CreateConnection(); |
+ virtual std::unique_ptr<cryptauth::Connection> CreateConnection(); |
// Calls bluetooth_util::SeekDeviceByAddress. Exposed for testing, as this |
// utility function is platform dependent. |
@@ -77,9 +78,10 @@ class BluetoothConnectionFinder : public ConnectionFinder, |
void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter); |
// ConnectionObserver: |
- void OnConnectionStatusChanged(Connection* connection, |
- Connection::Status old_status, |
- Connection::Status new_status) override; |
+ void OnConnectionStatusChanged( |
+ cryptauth::Connection* connection, |
+ cryptauth::Connection::Status old_status, |
+ cryptauth::Connection::Status new_status) override; |
// Used to invoke |connection_callback_| asynchronously, decoupling the |
// callback invocation from the ConnectionObserver callstack. |
@@ -104,7 +106,7 @@ class BluetoothConnectionFinder : public ConnectionFinder, |
scoped_refptr<device::BluetoothAdapter> adapter_; |
// The Bluetooth connection that will be opened. |
- std::unique_ptr<Connection> connection_; |
+ std::unique_ptr<cryptauth::Connection> connection_; |
// Whether there is currently a polling task scheduled. |
bool has_delayed_poll_scheduled_; |