Hook up ProximityAuthSystem in EasyUnlockService.

chrome/browser/signin/easy_unlock_service_regular.cc

Index: chrome/browser/signin/easy_unlock_service_regular.cc
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index cd967d2a055883353a670a33bd49e86c2d1f5673..30684b97f9fffc92891acd818a61b6677ebe94bc 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -24,15 +24,17 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/user_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 #include "components/proximity_auth/cryptauth/cryptauth_access_token_fetcher.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.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_enrollment_utils.h"
 #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h"
 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
 #include "components/proximity_auth/cryptauth_enroller_factory_impl.h"
 #include "components/proximity_auth/logging/logging.h"
+#include "components/proximity_auth/proximity_auth_system.h"
+#include "components/proximity_auth/remote_device_loader.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/proximity_auth/switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ -73,8 +75,8 @@ EasyUnlockServiceRegular::EasyUnlockServiceRegular(Profile* profile)
       turn_off_flow_status_(EasyUnlockService::IDLE),
       will_unlock_using_easy_unlock_(false),
       lock_screen_last_shown_timestamp_(base::TimeTicks::Now()),
-      weak_ptr_factory_(this) {
-}
+      deferring_device_load_(false),
+      weak_ptr_factory_(this) {}
 
 EasyUnlockServiceRegular::~EasyUnlockServiceRegular() {
 }
@@ -89,6 +91,54 @@ EasyUnlockServiceRegular::GetCryptAuthDeviceManager() {
   return device_manager_.get();
 }
 
+void EasyUnlockServiceRegular::LoadRemoteDevices() {
+  if (device_manager_->unlock_keys().empty()) {
+    OnRemoteDeviceChanged(nullptr);
+    return;
+  }
+
+  remote_device_loader_.reset(new proximity_auth::RemoteDeviceLoader(
+      device_manager_->unlock_keys(), proximity_auth_client()->GetAccountId(),
+      enrollment_manager_->GetUserPrivateKey(),
+      proximity_auth_client()->CreateSecureMessageDelegate()));
+  remote_device_loader_->Load(
+      base::Bind(&EasyUnlockServiceRegular::OnRemoteDevicesLoaded,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void EasyUnlockServiceRegular::OnRemoteDevicesLoaded(
+    const std::vector<proximity_auth::RemoteDevice>& remote_devices) {
+  // TODO(tengs): We only support unlocking with one remote device at the
+  // moment. We need to revisit once multiple devices are supported.
+  OnRemoteDeviceChanged(&remote_devices[0]);
+
+#if defined(OS_CHROMEOS)
+  // We need to store a copy of |remote devices_| in the TPM, so it can be
+  // retrieved on the sign-in screen when a user session has not been started
+  // yet.
+  scoped_ptr<base::ListValue> device_list(new base::ListValue());
+  for (const auto& device : remote_devices) {
+    scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+    std::string b64_public_key, b64_psk;
+    proximity_auth::Base64UrlEncode(device.public_key, &b64_public_key);
+    proximity_auth::Base64UrlEncode(device.persistent_symmetric_key, &b64_psk);
+
+    dict->SetString("name", device.name);
+    dict->SetString("psk", b64_psk);
+    dict->SetString("bluetoothAddress", device.bluetooth_address);
+    dict->SetString("permitId", "permit://google.com/easyunlock/v1/" +
+                                    proximity_auth_client()->GetAccountId());
+    dict->SetString("permitRecord.id", b64_public_key);
+    dict->SetString("permitRecord.type", "license");
+    dict->SetString("permitRecord.data", b64_public_key);
+    device_list->Append(dict.Pass());
+  }
+
+  // TODO(tengs): Rename this function after the easy_unlock app is replaced.
+  SetRemoteDevices(*device_list);
+#endif
+}
+
 EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const {
   return EasyUnlockService::TYPE_REGULAR;
 }
@@ -314,13 +364,15 @@ void EasyUnlockServiceRegular::InitializeInternal() {
                  base::Bind(&EasyUnlockServiceRegular::OnPrefsChanged,
                             base::Unretained(this)));
 
+  OnPrefsChanged();
+
 #if defined(OS_CHROMEOS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))
+          proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) {
     InitializeCryptAuth();
+    LoadRemoteDevices();
+  }
 #endif
-
-  OnPrefsChanged();
 }
 
 void EasyUnlockServiceRegular::ShutdownInternal() {
@@ -362,7 +414,7 @@ void EasyUnlockServiceRegular::OnWillFinalizeUnlock(bool success) {
   will_unlock_using_easy_unlock_ = success;
 }
 
-void EasyUnlockServiceRegular::OnSuspendDone() {
+void EasyUnlockServiceRegular::OnSuspendDoneInternal() {
   lock_screen_last_shown_timestamp_ = base::TimeTicks::Now();
 }
 
@@ -373,11 +425,30 @@ void EasyUnlockServiceRegular::OnRefreshTokenAvailable(
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
     token_service->RemoveObserver(this);
 #if defined(OS_CHROMEOS)
-    InitializeCryptAuth();
+    enrollment_manager_->Start();
+    device_manager_->Start();
 #endif
   }
 }
 
+void EasyUnlockServiceRegular::OnSyncStarted() {}

[sacomoto, 2015/09/29 18:45:57]

nit: Add an empty implementation to methods in
|CryptAuthDeviceManager::Observer|, instead of this.

[Tim Song, 2015/09/30 00:05:04]

Done.

+
+void EasyUnlockServiceRegular::OnSyncFinished(
+    proximity_auth::CryptAuthDeviceManager::SyncResult sync_result,
+    proximity_auth::CryptAuthDeviceManager::DeviceChangeResult
+        device_change_result) {
+  if (device_change_result !=
+      proximity_auth::CryptAuthDeviceManager::DeviceChangeResult::CHANGED)
+    return;
+
+  if (proximity_auth::ScreenlockBridge::Get()->IsLocked()) {
+    PA_LOG(INFO) << "Deferring device load until screen is unlocked.";
+    deferring_device_load_ = true;
+  } else {
+    LoadRemoteDevices();
+  }
+}
+
 void EasyUnlockServiceRegular::OnScreenDidLock(
     proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type) {
   will_unlock_using_easy_unlock_ = false;
@@ -406,6 +477,14 @@ void EasyUnlockServiceRegular::OnScreenDidUnlock(
   }
 
   will_unlock_using_easy_unlock_ = false;
+
+  // If we synced remote devices while the screen was locked, we can now load
+  // the new remote devices.
+  if (deferring_device_load_) {
+    PA_LOG(INFO) << "Loading deferred devices after screen unlock.";
+    deferring_device_load_ = false;
+    LoadRemoteDevices();
+  }
 }
 
 void EasyUnlockServiceRegular::OnFocusedUserChanged(
@@ -506,15 +585,6 @@ cryptauth::GcmDeviceInfo EasyUnlockServiceRegular::GetGcmDeviceInfo() {
 
 #if defined(OS_CHROMEOS)
 void EasyUnlockServiceRegular::InitializeCryptAuth() {
-  OAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
-  if (!token_service->RefreshTokenIsAvailable(
-          proximity_auth_client()->GetAccountId())) {
-    PA_LOG(INFO) << "Refresh token not yet available.";
-    token_service->AddObserver(this);
-    return;
-  }
-
   PA_LOG(INFO) << "Initializing CryptAuth managers.";
   // Initialize GCM manager.
   gcm_manager_.reset(new proximity_auth::CryptAuthGCMManagerImpl(
@@ -531,13 +601,24 @@ void EasyUnlockServiceRegular::InitializeCryptAuth() {
       proximity_auth_client()->CreateSecureMessageDelegate(),
       GetGcmDeviceInfo(), gcm_manager_.get(),
       proximity_auth_client()->GetPrefService()));
-  enrollment_manager_->Start();
 
   // Initialize device manager.
   device_manager_.reset(new proximity_auth::CryptAuthDeviceManager(
       make_scoped_ptr(new base::DefaultClock()),
       proximity_auth_client()->CreateCryptAuthClientFactory(),
       gcm_manager_.get(), proximity_auth_client()->GetPrefService()));
+
+  OAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
+  if (!token_service->RefreshTokenIsAvailable(
+          proximity_auth_client()->GetAccountId())) {
+    PA_LOG(INFO) << "Refresh token not yet available, "
+                 << "waiting before starting CryptAuth managers";
+    token_service->AddObserver(this);
+  }

[sacomoto, 2015/09/29 18:45:57]

Why does the order matter?

[Tim Song, 2015/09/30 00:05:04]

I want to avoid these managers being returned as null in
ChromeProximityAuthClient during initialization. We should be able to read the
existing prefs before the syncing is started.

+
+  device_manager_->AddObserver(this);
+  enrollment_manager_->Start();
   device_manager_->Start();
 }
 #endif