Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: chromeos/components/tether/ble_advertiser.cc

Issue 2847233003: [EasyUnlock] Move DataWithTimestamp out of ForegroundEidGenerator so it can be shared. (Closed)
Patch Set: fixes Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/components/tether/ble_advertiser.cc
diff --git a/chromeos/components/tether/ble_advertiser.cc b/chromeos/components/tether/ble_advertiser.cc
index e20ecd10b5d5b73cadd90308640e5a576ec38a99..2211410fdccda8ffe2cf326e9d24c8cd9342a452 100644
--- a/chromeos/components/tether/ble_advertiser.cc
+++ b/chromeos/components/tether/ble_advertiser.cc
@@ -32,8 +32,7 @@ void BleAdvertiser::BleAdvertisementUnregisterHandlerImpl::
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),
@@ -211,9 +210,9 @@ bool BleAdvertiser::StartAdvertisingToDevice(
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() << ". "

Powered by Google App Engine
This is Rietveld 408576698