Change chrome://proximity-auth to use RemoteDeviceLifeCycle.

components/proximity_auth/webui/proximity_auth_webui_handler.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_
 #define COMPONENTS_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "components/proximity_auth/authenticator.h"
 #include "components/proximity_auth/connection_observer.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client.h"
 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager.h"
 #include "components/proximity_auth/logging/log_buffer.h"
 #include "components/proximity_auth/messenger_observer.h"
 #include "components/proximity_auth/proximity_auth_client.h"
+#include "components/proximity_auth/remote_device_life_cycle.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace cryptauth {
 class ExternalDeviceInfo;
 }
 
 namespace proximity_auth {
 
-class Authenticator;
-class BluetoothConnection;
-class BluetoothThrottler;
-class BluetoothLowEnergyDeviceWhitelist;
-class Connection;
-class ConnectionFinder;
-class MessengerImpl;
 class ReachablePhoneFlow;
+class RemoteDeviceLifeCycle;
 struct RemoteStatusUpdate;
 class SecureContext;
 
 // Handles messages from the chrome://proximity-auth page.
 class ProximityAuthWebUIHandler : public content::WebUIMessageHandler,
                                   public LogBuffer::Observer,
                                   public CryptAuthEnrollmentManager::Observer,
                                   public CryptAuthDeviceManager::Observer,
-                                  public ConnectionObserver,
+                                  public RemoteDeviceLifeCycle::Observer,
                                   public MessengerObserver {
  public:
   // |client_| is not owned and must outlive this instance.
   explicit ProximityAuthWebUIHandler(
       ProximityAuthClient* proximity_auth_client);
   ~ProximityAuthWebUIHandler() override;
 
   // content::WebUIMessageHandler:
   void RegisterMessages() override;
 
@@ skipping 40 matching lines @@
       const cryptauth::FindEligibleUnlockDevicesResponse& response);
 
   // Callback when |reachable_phone_flow_| completes.
   void OnReachablePhonesFound(
       const std::vector<cryptauth::ExternalDeviceInfo>& reachable_phones);
 
   // Called when the key agreement of PSK of the remote device completes.
   void OnPSKDerived(const cryptauth::ExternalDeviceInfo& unlock_key,
                     const std::string& persistent_symmetric_key);
 
-  // Tries to create a classic Bluetooth connection to the unlock key.
-  void FindBluetoothClassicConnection(const RemoteDevice& remote_device);
-
-  // Tries to create a Bluetooth Low Energy connection to the unlock key.
-  void FindBluetoothLowEnergyConnection(const RemoteDevice& remote_device);
-
-  // Called when |connection_finder_| finds a connection.
-  void OnConnectionFound(scoped_ptr<Connection> connection);
-
-  // Callback when |authenticator_| completes authentication.
-  void OnAuthenticationResult(Authenticator::Result result,
-                              scoped_ptr<SecureContext> secure_context);
-
-  // Creates the client which parses status updates.
-  void CreateStatusUpdateMessenger();
-
-  // Returns the active connection, whether it's owned the |this| instance or
-  // |client_|.
-  Connection* GetConnection();
-
   // Converts an ExternalDeviceInfo proto to a JSON dictionary used in
   // JavaScript.
   scoped_ptr<base::DictionaryValue> ExternalDeviceInfoToDictionary(
       const cryptauth::ExternalDeviceInfo& device_info);
 
   // Converts an IneligibleDevice proto to a JSON dictionary used in JavaScript.
   scoped_ptr<base::DictionaryValue> IneligibleDeviceToDictionary(
       const cryptauth::IneligibleDevice& ineligible_device);
 
-  // ConnectionObserver:
-  void OnConnectionStatusChanged(Connection* connection,
-                                 Connection::Status old_status,
-                                 Connection::Status new_status) override;
-  void OnMessageReceived(const Connection& connection,
-                         const WireMessage& message) override;
+  // Cleans up the connection to the selected remote device.
+  void CleanUpRemoteDeviceLifeCycle();
+
+  // RemoteDeviceLifeCycle::Observer:
+  void OnLifeCycleStateChanged(RemoteDeviceLifeCycle::State old_state,
+                               RemoteDeviceLifeCycle::State new_state) override;
 
   // MessengerObserver:
   void OnRemoteStatusUpdate(const RemoteStatusUpdate& status_update) override;
 
   // Returns the current enrollment state that can be used as a JSON object.
   scoped_ptr<base::DictionaryValue> GetEnrollmentStateDictionary();
 
   // Returns the current device sync state that can be used as a JSON object.
   scoped_ptr<base::DictionaryValue> GetDeviceSyncStateDictionary();
 
@@ skipping 12 matching lines @@
   // The flow for getting a list of reachable phones.
   scoped_ptr<ReachablePhoneFlow> reachable_phone_flow_;
 
   // True if we get a message from the loaded WebContents to know that it is
   // initialized, and we can inject JavaScript.
   bool web_contents_initialized_;
 
   // Member variables for connecting to and authenticating the remote device.
   // TODO(tengs): Support multiple simultaenous connections.
   scoped_ptr<SecureMessageDelegate> secure_message_delegate_;
-  scoped_ptr<BluetoothLowEnergyDeviceWhitelist> ble_device_whitelist_;
   RemoteDevice selected_remote_device_;
-  scoped_ptr<BluetoothThrottler> bluetooth_throttler_;
-  scoped_ptr<ConnectionFinder> connection_finder_;
-  scoped_ptr<Connection> connection_;
-  scoped_ptr<Authenticator> authenticator_;
-  scoped_ptr<SecureContext> secure_context_;
-  scoped_ptr<MessengerImpl> messenger_;
+  scoped_ptr<RemoteDeviceLifeCycle> life_cycle_;
   scoped_ptr<RemoteStatusUpdate> last_remote_status_update_;
 
   base::WeakPtrFactory<ProximityAuthWebUIHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProximityAuthWebUIHandler);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_