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

components/proximity_auth/bluetooth_low_energy_connection_finder.cc

 // 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.
 
 #include "components/proximity_auth/bluetooth_low_energy_connection_finder.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/cryptauth/background_eid_generator.h"
 #include "components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h"
 #include "components/cryptauth/bluetooth_throttler.h"
 #include "components/cryptauth/connection.h"
+#include "components/cryptauth/raw_eid_generator.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_common.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothGattConnection;
@@ skipping 129 matching lines @@
   if (!device)
     return false;
 
   device::BluetoothUUID advertisement_uuid(kAdvertisementUUID);
   const std::vector<uint8_t>* service_data =
       device->GetServiceDataForUUID(advertisement_uuid);
   if (!service_data)
     return false;
 
   std::string service_data_string(service_data->begin(), service_data->end());
-  std::vector<std::string> nearest_eids =
+  std::vector<cryptauth::EidDataWithTimestamp> nearest_eids =
       eid_generator_->GenerateNearestEids(beacon_seeds_);
-  for (const std::string& eid : nearest_eids) {
-    if (eid == service_data_string) {
-      PA_LOG(INFO) << "Found a matching EID: " << eid;
+  for (const cryptauth::EidDataWithTimestamp& eid : nearest_eids) {
+    if (eid.data == service_data_string) {
+      PA_LOG(INFO) << "Found a matching EID: " << eid.DataInHex();
       return true;
     }
   }
   return false;
 }
 
 void BluetoothLowEnergyConnectionFinder::OnAdapterInitialized(
     scoped_refptr<BluetoothAdapter> adapter) {
   PA_LOG(INFO) << "Adapter ready";
   adapter_ = adapter;
@@ skipping 88 matching lines @@
   connection_.reset();
   if (!discovery_session_ || !discovery_session_->IsActive())
     StartDiscoverySession();
 }
 
 void BluetoothLowEnergyConnectionFinder::InvokeCallbackAsync() {
   connection_callback_.Run(std::move(connection_));
 }
 
 }  // namespace proximity_auth