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

chromeos/components/tether/ble_advertiser.cc

 // Copyright 2016 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 "chromeos/components/tether/ble_advertiser.h"
 
 #include "base/bind.h"
 #include "chromeos/components/tether/ble_constants.h"
 #include "chromeos/components/tether/local_device_data_provider.h"
 #include "components/cryptauth/proto/cryptauth_api.pb.h"
@@ skipping 14 matching lines @@
 
 void BleAdvertiser::BleAdvertisementUnregisterHandlerImpl::
     OnAdvertisementUnregisterFailure(
         device::BluetoothAdvertisement::ErrorCode error_code) {
   PA_LOG(ERROR) << "Error while unregistering advertisement. Error code: "
                 << error_code;
 }
 
 BleAdvertiser::IndividualAdvertisement::IndividualAdvertisement(
     scoped_refptr<device::BluetoothAdapter> adapter,
-    std::unique_ptr<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-        advertisement_data,
+    std::unique_ptr<cryptauth::DataWithTimestamp> advertisement_data,
     std::shared_ptr<BleAdvertisementUnregisterHandler> unregister_handler)
     : adapter_(adapter),
       is_initializing_advertising_(false),
       advertisement_data_(std::move(advertisement_data)),
       unregister_handler_(unregister_handler),
       advertisement_(nullptr),
       weak_ptr_factory_(this) {
   adapter_->AddObserver(this);
   AdvertiseIfPossible();
 }
@@ skipping 157 matching lines @@
                     << remote_device.GetTruncatedDeviceIdForLogs() << ". "
                     << "Cannot advertise without seeds.";
     return false;
   } else if (remote_beacon_seeds.empty()) {
     PA_LOG(WARNING) << "No synced seeds exist for device with ID "
                     << remote_device.GetTruncatedDeviceIdForLogs() << ". "
                     << "Cannot advertise without seeds.";
     return false;
   }
 
-  std::unique_ptr<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-      advertisement = eid_generator_->GenerateAdvertisement(
-          local_device_public_key, remote_beacon_seeds);
+  std::unique_ptr<cryptauth::DataWithTimestamp> advertisement =
+      eid_generator_->GenerateAdvertisement(local_device_public_key,
+                                            remote_beacon_seeds);
   if (!advertisement) {
     PA_LOG(WARNING) << "Error generating advertisement for device with ID "
                     << remote_device.GetTruncatedDeviceIdForLogs() << ". "
                     << "Cannot advertise.";
     return false;
   }
 
   device_id_to_advertisement_map_[remote_device.GetDeviceId()] =
       make_scoped_refptr(new IndividualAdvertisement(
           adapter_, std::move(advertisement), unregister_handler_));
   return true;
 }
 
 bool BleAdvertiser::StopAdvertisingToDevice(
     const cryptauth::RemoteDevice& remote_device) {
   return device_id_to_advertisement_map_.erase(remote_device.GetDeviceId()) > 0;
 }
 
 }  // namespace tether
 
 }  // namespace chromeos