Add RemoteDeviceLoader to create RemoteDevice from CryptAuth data.

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"
@@ skipping 13 matching lines @@
 }
 
 namespace cryptauth {
 class ExternalDeviceInfo;
 }
 
 namespace proximity_auth {
 
 class ReachablePhoneFlow;
 class RemoteDeviceLifeCycle;
+class RemoteDeviceLoader;
 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 RemoteDeviceLifeCycle::Observer,
                                   public MessengerObserver {
  public:
   // |client_| is not owned and must outlive this instance.
@@ skipping 43 matching lines @@
   void OnEasyUnlockToggled(const cryptauth::ToggleEasyUnlockResponse& response);
 
   // Called when the findEligibleUnlockDevices request succeeds.
   void OnFoundEligibleUnlockDevices(
       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);
+  // Called when the RemoteDevice is loaded so we can create a connection.
+  void OnRemoteDevicesLoaded(const std::vector<RemoteDevice>& remote_devices);
 
   // 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);
 
@@ skipping 27 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<RemoteDeviceLoader> remote_device_loader_;
   RemoteDevice selected_remote_device_;
   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_