[EasyUnlock] Move DataWithTimestamp out of ForegroundEidGenerator so it can be shared.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.

[Kyle Horimoto, 2017/04/30 03:17:43]

Did you mean to change this file as part of the CL? This seems orthogonal to the
purpose of this one - can you submit it separately?

Same with easy_unlock_service_signin_chromeos.cc.

[Tim Song, 2017/05/01 22:23:38]

Done. Sorry, accidentally added this file.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 46 matching lines @@
   if (!tpm_key_manager) {
     PA_LOG(ERROR) << "No TPM key manager.";
     callback.Run(false);
     return;
   }
 
   // Private TPM key is needed only when adding new keys.
   if (remote_devices.empty() ||
       tpm_key_manager->PrepareTpmKey(false /* check_private_key */,
                                      do_refresh_keys)) {
+    PA_LOG(WARNING) << "Refreshing keys...";
     do_refresh_keys.Run();
   } else {
     // In case Chrome is supposed to restart to apply user session flags, the
     // Chrome restart will be postponed until Easy Sign-in keys are refreshed.
     // This is to ensure that creating TPM key does not hang if TPM system
     // loading takes too much time. Note that in normal circumstances the
     // chances that TPM slot cannot be loaded should be extremely low.
     // TODO(tbarzic): Add some metrics to measure if the timeout even gets hit.
+    PA_LOG(WARNING) << "Refresh keys after loading TPM...";
     tpm_key_manager->StartGetSystemSlotTimeoutMs(2000);
   }
 }
 
 void EasyUnlockKeyManager::RefreshKeysWithTpmKeyPresent(
     const UserContext& user_context,
     base::ListValue* remote_devices,
     const RefreshKeysCallback& callback) {
   EasyUnlockTpmKeyManager* tpm_key_manager =
       EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser(
           user_context.GetAccountId().GetUserEmail());
   const std::string tpm_public_key =
       tpm_key_manager->GetPublicTpmKey(user_context.GetAccountId());
 
+  PA_LOG(WARNING) << "Refreshing keys: " << remote_devices;
+
   EasyUnlockDeviceKeyDataList devices;
-  if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices))
+  if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices)) {
+    PA_LOG(ERROR) << "ERROR Coverting remote devices";
     devices.clear();
+  }
 
   write_operation_queue_.push_back(
       base::MakeUnique<EasyUnlockRefreshKeysOperation>(
           user_context, tpm_public_key, devices,
           base::Bind(&EasyUnlockKeyManager::OnKeysRefreshed,
                      weak_ptr_factory_.GetWeakPtr(), callback)));
   RunNextOperation();
 }
 
 void EasyUnlockKeyManager::GetDeviceDataList(
@@ skipping 131 matching lines @@
     const EasyUnlockDeviceKeyDataList& fetched_data) {
   if (!callback.is_null())
     callback.Run(fetch_success, fetched_data);
 
   DCHECK(pending_read_operation_);
   pending_read_operation_.reset();
   RunNextOperation();
 }
 
 }  // namespace chromeos