Reauthenticate the user before launching Smart Lock setup app.

chrome/browser/signin/easy_unlock_service.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/signin/easy_unlock_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 365 matching lines @@
   if (user_id.empty())
     return;
 
   const base::ListValue* device_list = GetRemoteDevices();
   std::set<std::string> paired_devices;
   if (device_list) {
     chromeos::EasyUnlockDeviceKeyDataList parsed_paired;
     chromeos::EasyUnlockKeyManager::RemoteDeviceListToDeviceDataList(
         *device_list, &parsed_paired);
     for (const auto& device_key_data : parsed_paired)
-      paired_devices.insert(device_key_data.public_key);
+      paired_devices.insert(device_key_data.psk);
   }
   if (paired_devices.empty()) {
     SetHardlockState(EasyUnlockScreenlockStateHandler::NO_PAIRING);
     return;
   }
 
-  // No need to compare if a change is already recorded.
-  if (GetHardlockState() == EasyUnlockScreenlockStateHandler::PAIRING_CHANGED)

[tbarzic, 2014/11/01 23:21:45]

can we add this back now?

[Tim Song, 2014/11/03 19:10:43]

Done.

-    return;
-
   chromeos::EasyUnlockKeyManager* key_manager =
       chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager();
   DCHECK(key_manager);
 
   key_manager->GetDeviceDataList(
       chromeos::UserContext(user_id),
       base::Bind(&EasyUnlockService::OnCryptohomeKeysFetchedForChecking,
                  weak_ptr_factory_.GetWeakPtr(),
                  user_id,
                  paired_devices));
@@ skipping 204 matching lines @@
   DCHECK(!user_id.empty() && !paired_devices.empty());
 
   if (!success) {
     SetHardlockStateForUser(user_id,
                             EasyUnlockScreenlockStateHandler::NO_PAIRING);
     return;
   }
 
   std::set<std::string> devices_in_cryptohome;
   for (const auto& device_key_data : key_data_list)
-    devices_in_cryptohome.insert(device_key_data.public_key);
+    devices_in_cryptohome.insert(device_key_data.psk);
 
   if (paired_devices != devices_in_cryptohome ||
       GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
     SetHardlockStateForUser(user_id,
                             EasyUnlockScreenlockStateHandler::PAIRING_CHANGED);
   }
 }
 #endif
 
 void EasyUnlockService::PrepareForSuspend() {
   DisableAppIfLoaded();
   if (screenlock_state_handler_ && screenlock_state_handler_->IsActive()) {
     UpdateScreenlockState(
         EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING);
   }
 }