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

chromeos/components/tether/ble_advertiser.h

 // 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.
 
 #ifndef CHROMEOS_COMPONENTS_TETHER_BLE_ADVERTISER_H_
 #define CHROMEOS_COMPONENTS_TETHER_BLE_ADVERTISER_H_
 
 #include <map>
 
 #include "base/macros.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "components/cryptauth/eid_data_with_timestamp.h"
 #include "components/cryptauth/foreground_eid_generator.h"
 #include "components/cryptauth/remote_device.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_advertisement.h"
 
 namespace cryptauth {
 class RemoteBeaconSeedFetcher;
 }
 
@@ skipping 39 matching lines @@
         device::BluetoothAdvertisement::ErrorCode error_code) override;
   };
 
   class IndividualAdvertisement
       : public device::BluetoothAdapter::Observer,
         public device::BluetoothAdvertisement::Observer,
         public base::RefCounted<IndividualAdvertisement> {
    public:
     IndividualAdvertisement(
         scoped_refptr<device::BluetoothAdapter> adapter,
-        std::unique_ptr<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-            advertisement_data,
+        std::unique_ptr<cryptauth::EidDataWithTimestamp> advertisement_data,
         std::shared_ptr<BleAdvertisementUnregisterHandler> unregister_handler);
 
     // device::BluetoothAdapter::Observer
     void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
                                bool powered) override;
 
     // device::BluetoothAdvertisement::Observer
     void AdvertisementReleased(
         device::BluetoothAdvertisement* advertisement) override;
 
@@ skipping 12 matching lines @@
     std::unique_ptr<device::BluetoothAdvertisement::UUIDList>
     CreateServiceUuids() const;
 
     std::unique_ptr<device::BluetoothAdvertisement::ServiceData>
     CreateServiceData() const;
 
     std::string ServiceDataInHex() const;
 
     scoped_refptr<device::BluetoothAdapter> adapter_;
     bool is_initializing_advertising_;
-    std::unique_ptr<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-        advertisement_data_;
+    std::unique_ptr<cryptauth::EidDataWithTimestamp> advertisement_data_;
     std::shared_ptr<BleAdvertisementUnregisterHandler> unregister_handler_;
     scoped_refptr<device::BluetoothAdvertisement> advertisement_;
 
     base::WeakPtrFactory<IndividualAdvertisement> weak_ptr_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(IndividualAdvertisement);
   };
 
   BleAdvertiser(
       scoped_refptr<device::BluetoothAdapter> adapter,
@@ skipping 14 matching lines @@
       device_id_to_advertisement_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BleAdvertiser);
 };
 
 }  // namespace tether
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_COMPONENTS_TETHER_BLE_ADVERTISER_H_