Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/unlock_manager.cc

Index: components/proximity_auth/unlock_manager.cc
diff --git a/components/proximity_auth/unlock_manager.cc b/components/proximity_auth/unlock_manager.cc
index e55ad50814ff678267ed6b4f73b051e385a6f75f..bdd34d6edd1438b2cd467278310c1b810e3d42e0 100644
--- a/components/proximity_auth/unlock_manager.cc
+++ b/components/proximity_auth/unlock_manager.cc
@@ -80,7 +80,6 @@ UnlockManager::UnlockManager(ScreenlockType screenlock_type,
                              ProximityAuthClient* proximity_auth_client)
     : screenlock_type_(screenlock_type),
       life_cycle_(nullptr),
-      messenger_(nullptr),
       proximity_monitor_(proximity_monitor.Pass()),
       proximity_auth_client_(proximity_auth_client),
       is_locked_(false),
@@ -113,8 +112,8 @@ UnlockManager::UnlockManager(ScreenlockType screenlock_type,
 }
 
 UnlockManager::~UnlockManager() {
-  if (messenger_)
-    messenger_->RemoveObserver(this);
+  if (GetMessenger())
+    GetMessenger()->RemoveObserver(this);
 
   ScreenlockBridge::Get()->RemoveObserver(this);
 
@@ -134,15 +133,13 @@ bool UnlockManager::IsUnlockAllowed() {
               RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED &&
           proximity_monitor_->IsUnlockAllowed() &&
           (screenlock_type_ != ScreenlockType::SIGN_IN ||
-           (messenger_ && messenger_->SupportsSignIn())));
+           (GetMessenger() && GetMessenger()->SupportsSignIn())));
 }
 
 void UnlockManager::SetRemoteDeviceLifeCycle(
     RemoteDeviceLifeCycle* life_cycle) {
-  if (messenger_) {
-    messenger_->RemoveObserver(this);
-    messenger_ = nullptr;
-  }
+  if (GetMessenger())
+    GetMessenger()->RemoveObserver(this);
 
   life_cycle_ = life_cycle;
   if (life_cycle_)
@@ -157,10 +154,8 @@ void UnlockManager::OnLifeCycleStateChanged() {
                << static_cast<int>(state);
 
   remote_screenlock_state_.reset();
-  if (state == RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED) {
-    messenger_ = life_cycle_->GetMessenger();
-    messenger_->AddObserver(this);
-  }
+  if (state == RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED)
+    GetMessenger()->AddObserver(this);
 
   if (state == RemoteDeviceLifeCycle::State::AUTHENTICATION_FAILED)
     SetWakingUpState(false);
@@ -209,7 +204,7 @@ void UnlockManager::OnDecryptResponse(scoped_ptr<std::string> decrypted_bytes) {
     AcceptAuthAttempt(false);
   } else {
     sign_in_secret_ = decrypted_bytes.Pass();
-    messenger_->DispatchUnlockEvent();
+    GetMessenger()->DispatchUnlockEvent();
   }
 }
 
@@ -223,14 +218,13 @@ void UnlockManager::OnUnlockResponse(bool success) {
   PA_LOG(INFO) << "[Unlock] Unlock response from remote device: "
                << (success ? "success" : "failure");
   if (success)
-    messenger_->DispatchUnlockEvent();
+    GetMessenger()->DispatchUnlockEvent();
   else
     AcceptAuthAttempt(false);
 }
 
 void UnlockManager::OnDisconnected() {
-  messenger_->RemoveObserver(this);
-  messenger_ = nullptr;
+  GetMessenger()->RemoveObserver(this);
 }
 
 void UnlockManager::OnScreenDidLock(
@@ -316,12 +310,12 @@ void UnlockManager::OnAuthAttempted(
   if (screenlock_type_ == ScreenlockType::SIGN_IN) {
     SendSignInChallenge();
   } else {
-    if (messenger_->SupportsSignIn()) {
-      messenger_->RequestUnlock();
+    if (GetMessenger()->SupportsSignIn()) {
+      GetMessenger()->RequestUnlock();
     } else {
       PA_LOG(INFO) << "[Unlock] Protocol v3.1 not supported, skipping "
                    << "request_unlock.";
-      messenger_->DispatchUnlockEvent();
+      GetMessenger()->DispatchUnlockEvent();
     }
   }
 }
@@ -349,8 +343,9 @@ ScreenlockState UnlockManager::GetScreenlockState() {
   if (!bluetooth_adapter_ || !bluetooth_adapter_->IsPowered())
     return ScreenlockState::NO_BLUETOOTH;
 
-  if (screenlock_type_ == ScreenlockType::SIGN_IN && messenger_ &&
-      !messenger_->SupportsSignIn())
+  Messenger* messenger = GetMessenger();
+  if (screenlock_type_ == ScreenlockType::SIGN_IN && messenger &&
+      !messenger->SupportsSignIn())
     return ScreenlockState::PHONE_UNSUPPORTED;
 
   // If the RSSI is too low, then the remote device is nowhere near the local
@@ -404,6 +399,7 @@ void UnlockManager::UpdateLockScreen() {
   if (screenlock_state_ == new_state)
     return;
 
+  PA_LOG(ERROR) << "UPDATE LOCK SCREEN: " << static_cast<int>(new_state);
   proximity_auth_client_->UpdateScreenlockState(new_state);
   screenlock_state_ = new_state;
 }
@@ -468,4 +464,12 @@ UnlockManager::GetScreenlockStateFromRemoteUpdate(RemoteStatusUpdate update) {
   return RemoteScreenlockState::UNKNOWN;
 }
 
+Messenger* UnlockManager::GetMessenger() {
+  // TODO(tengs): We should use a weak pointer to hold the Messenger instance
+  // instead.
+  if (!life_cycle_)
+    return nullptr;
+  return life_cycle_->GetMessenger();
+}
+
 }  // namespace proximity_auth