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

chromeos/components/tether/ble_advertiser_unittest.cc

Index: chromeos/components/tether/ble_advertiser_unittest.cc
diff --git a/chromeos/components/tether/ble_advertiser_unittest.cc b/chromeos/components/tether/ble_advertiser_unittest.cc
index d8caac628c414b10fcd125da53ceeb1e1e25b863..8872324afb0b2adb4844bf552883984713dd3c02 100644
--- a/chromeos/components/tether/ble_advertiser_unittest.cc
+++ b/chromeos/components/tether/ble_advertiser_unittest.cc
@@ -80,15 +80,14 @@ class MockBluetoothAdapterWithAdvertisements
   ~MockBluetoothAdapterWithAdvertisements() override {}
 };
 
-std::vector<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-GenerateFakeAdvertisements() {
-  cryptauth::ForegroundEidGenerator::DataWithTimestamp advertisement1(
-      "advertisement1", 1000L, 2000L);
-  cryptauth::ForegroundEidGenerator::DataWithTimestamp advertisement2(
-      "advertisement2", 2000L, 3000L);
-
-  std::vector<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-      advertisements = {advertisement1, advertisement2};
+std::vector<cryptauth::EidDataWithTimestamp> GenerateFakeAdvertisements() {
+  cryptauth::EidDataWithTimestamp advertisement1("advertisement1", 1000L,
+                                                 2000L);
+  cryptauth::EidDataWithTimestamp advertisement2("advertisement2", 2000L,
+                                                 3000L);
+
+  std::vector<cryptauth::EidDataWithTimestamp> advertisements = {
+      advertisement1, advertisement2};
   return advertisements;
 }
 
@@ -271,8 +270,7 @@ class BleAdvertiserTest : public testing::Test {
       individual_advertisements_;
 
   const std::vector<cryptauth::RemoteDevice> fake_devices_;
-  const std::vector<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-      fake_advertisements_;
+  const std::vector<cryptauth::EidDataWithTimestamp> fake_advertisements_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BleAdvertiserTest);
@@ -325,7 +323,7 @@ TEST_F(BleAdvertiserTest, AdapterPoweredOffWhenAdvertisementRegistered) {
   EXPECT_CALL(*mock_adapter_, IsPowered()).Times(1).WillOnce(Return(false));
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));
@@ -342,7 +340,7 @@ TEST_F(BleAdvertiserTest, RegisteringAdvertisementFails) {
   EXPECT_CALL(*mock_adapter_, RegisterAdvertisementWithArgsStruct(_)).Times(1);
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));
@@ -362,7 +360,7 @@ TEST_F(BleAdvertiserTest, AdvertisementRegisteredSuccessfully) {
   EXPECT_CALL(*mock_adapter_, RegisterAdvertisementWithArgsStruct(_)).Times(1);
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));
@@ -388,7 +386,7 @@ TEST_F(BleAdvertiserTest, AdvertisementRegisteredSuccessfully_TwoDevices) {
 
   // First device.
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));
@@ -402,7 +400,7 @@ TEST_F(BleAdvertiserTest, AdvertisementRegisteredSuccessfully_TwoDevices) {
 
   // Second device.
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[1]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[1]));
@@ -433,7 +431,7 @@ TEST_F(BleAdvertiserTest, TooManyDevicesRegistered) {
   EXPECT_CALL(*mock_adapter_, RegisterAdvertisementWithArgsStruct(_)).Times(3);
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   // Should succeed for the first two devices.
@@ -464,7 +462,7 @@ TEST_F(BleAdvertiserTest, AdapterPowerChange_StartsOffThenTurnsOn) {
   EXPECT_CALL(*mock_adapter_, RegisterAdvertisementWithArgsStruct(_)).Times(1);
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));
@@ -490,7 +488,7 @@ TEST_F(BleAdvertiserTest, AdvertisementReleased) {
   EXPECT_CALL(*mock_adapter_, RegisterAdvertisementWithArgsStruct(_)).Times(2);
 
   mock_eid_generator_->set_advertisement(
-      base::MakeUnique<cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+      base::MakeUnique<cryptauth::EidDataWithTimestamp>(
           fake_advertisements_[0]));
 
   EXPECT_TRUE(ble_advertiser_->StartAdvertisingToDevice(fake_devices_[0]));