Index: components/proximity_auth/remote_device_life_cycle_impl.h |
diff --git a/components/proximity_auth/remote_device_life_cycle_impl.h b/components/proximity_auth/remote_device_life_cycle_impl.h |
index 4a2912bd69978a24bd7a56845649db41ecb9298f..a4b983817121edb1529760a2b6142452445c746e 100644 |
--- a/components/proximity_auth/remote_device_life_cycle_impl.h |
+++ b/components/proximity_auth/remote_device_life_cycle_impl.h |
@@ -80,24 +80,12 @@ class RemoteDeviceLifeCycleImpl : public RemoteDeviceLifeCycle, |
// The current state in the life cycle. |
RemoteDeviceLifeCycle::State state_; |
- // Observers added to the life cycle. |
+ // Observers added to the life cycle. Configured as NOTIFY_EXISTING_ONLY. |
base::ObserverList<Observer> observers_; |
- // Rate limits Bluetooth connections to the same device. Used to in the |
- // created ConnectionFinder. |
- scoped_ptr<BluetoothThrottler> bluetooth_throttler_; |
- |
- // Used in the FINDING_CONNECTION state to establish a connection to the |
- // remote device. |
- scoped_ptr<ConnectionFinder> connection_finder_; |
- |
// The connection that is established by |connection_finder_|. |
scoped_ptr<Connection> connection_; |
- // Authenticates the remote device after it is connected. Used in the |
- // AUTHENTICATING state. |
- scoped_ptr<Authenticator> authenticator_; |
- |
// Context for encrypting and decrypting messages. Created after |
// authentication succeeds. Ownership is eventually passed to |messenger_|. |
scoped_ptr<SecureContext> secure_context_; |
@@ -106,6 +94,18 @@ class RemoteDeviceLifeCycleImpl : public RemoteDeviceLifeCycle, |
// SECURE_CHANNEL_ESTABLISHED state. |
scoped_ptr<Messenger> messenger_; |
+ // Authenticates the remote device after it is connected. Used in the |
+ // AUTHENTICATING state. |
+ scoped_ptr<Authenticator> authenticator_; |
+ |
+ // Used in the FINDING_CONNECTION state to establish a connection to the |
+ // remote device. |
+ scoped_ptr<ConnectionFinder> connection_finder_; |
+ |
+ // Rate limits Bluetooth connections to the same device. Used to in the |
+ // created ConnectionFinder. |
+ scoped_ptr<BluetoothThrottler> bluetooth_throttler_; |
+ |
// After authentication fails, this timer waits for a period of time before |
// retrying the connection. |
base::OneShotTimer authentication_recovery_timer_; |