Index: components/proximity_auth/throttled_bluetooth_connection_finder.h |
diff --git a/components/proximity_auth/throttled_bluetooth_connection_finder.h b/components/proximity_auth/throttled_bluetooth_connection_finder.h |
index 89c92e30f01e05aa56b5ff443ebd8484683b83f6..6af736193175e8be563b6988ebdfae2e0695c118 100644 |
--- a/components/proximity_auth/throttled_bluetooth_connection_finder.h |
+++ b/components/proximity_auth/throttled_bluetooth_connection_finder.h |
@@ -10,7 +10,9 @@ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/weak_ptr.h" |
-#include "components/proximity_auth/connection_finder.h" |
+#include "components/cryptauth/bluetooth_throttler.h" |
+#include "components/cryptauth/connection.h" |
+#include "components/cryptauth/connection_finder.h" |
namespace base { |
class TaskRunner; |
@@ -19,27 +21,27 @@ class TaskRunner; |
namespace proximity_auth { |
class BluetoothConnectionFinder; |
-class BluetoothThrottler; |
-class Connection; |
// A Bluetooth connection finder that delays Find() requests according to the |
// throttler's cooldown period. |
-class ThrottledBluetoothConnectionFinder : public ConnectionFinder { |
+class ThrottledBluetoothConnectionFinder : public cryptauth::ConnectionFinder { |
public: |
// Note: The |throttler| is not owned, and must outlive |this| instance. |
ThrottledBluetoothConnectionFinder( |
std::unique_ptr<BluetoothConnectionFinder> connection_finder, |
scoped_refptr<base::TaskRunner> task_runner, |
- BluetoothThrottler* throttler); |
+ cryptauth::BluetoothThrottler* throttler); |
~ThrottledBluetoothConnectionFinder() override; |
- // ConnectionFinder: |
- void Find(const ConnectionCallback& connection_callback) override; |
+ // cryptauth::ConnectionFinder: |
+ void Find(const cryptauth::ConnectionFinder::ConnectionCallback& |
+ connection_callback) override; |
private: |
// Callback to be called when a connection is found. |
- void OnConnection(const ConnectionCallback& connection_callback, |
- std::unique_ptr<Connection> connection); |
+ void OnConnection(const cryptauth::ConnectionFinder::ConnectionCallback& |
+ connection_callback, |
+ std::unique_ptr<cryptauth::Connection> connection); |
// The underlying connection finder. |
std::unique_ptr<BluetoothConnectionFinder> connection_finder_; |
@@ -49,7 +51,7 @@ class ThrottledBluetoothConnectionFinder : public ConnectionFinder { |
// The throttler managing this connection finder. The throttler is not owned, |
// and must outlive |this| instance. |
- BluetoothThrottler* throttler_; |
+ cryptauth::BluetoothThrottler* throttler_; |
base::WeakPtrFactory<ThrottledBluetoothConnectionFinder> weak_ptr_factory_; |