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

components/cryptauth/foreground_eid_generator.h

Index: components/cryptauth/foreground_eid_generator.h
diff --git a/components/cryptauth/foreground_eid_generator.h b/components/cryptauth/foreground_eid_generator.h
index 8068078c5e05f9df29c4a3d19645ac0dc30ae9e6..ad1cf33c34c311d5752863105fc49614d968a418 100644
--- a/components/cryptauth/foreground_eid_generator.h
+++ b/components/cryptauth/foreground_eid_generator.h
@@ -12,6 +12,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/clock.h"
+#include "components/cryptauth/data_with_timestamp.h"
 
 namespace cryptauth {
 
@@ -40,22 +41,6 @@ struct RemoteDevice;
 // See go/proximity-auth-ble-advertising.
 class ForegroundEidGenerator {
  public:
-  // Stores EID-related data and timestamps at which time this data becomes
-  // active or inactive.
-  struct DataWithTimestamp {
-    DataWithTimestamp(const std::string& data,
-                      const int64_t start_timestamp_ms,
-                      const int64_t end_timestamp_ms);
-    DataWithTimestamp(const DataWithTimestamp& other);
-
-    bool ContainsTime(const int64_t timestamp_ms) const;
-    std::string DataInHex() const;
-
-    const std::string data;
-    const int64_t start_timestamp_ms;
-    const int64_t end_timestamp_ms;
-  };
-
   // Data for both a current and adjacent EID. The current EID *must* be
   // supplied, but adjacent data may be null. Each EID consists of a 2-byte EID
   // value paired with the timestamp at which time this value becomes active or
@@ -84,8 +69,8 @@ class ForegroundEidGenerator {
   virtual ~ForegroundEidGenerator();
 
   // Generates EID data for the given EID seeds to be used as a background scan
-  // filter. In the normal case, two DataWithTimestamp values are returned, one
-  // for each EID seed rotation period. If data has not been synced from the
+  // filter. In the normal case, two DataWithTimestamp values are returned,
+  // one for each EID seed rotation period. If data has not been synced from the

[Kyle Horimoto, 2017/04/30 03:17:46]

Please revert the change.

[Tim Song, 2017/05/01 22:23:38]

Done.

   // backend recently and EID seeds are unavailable, nullptr is returned.
   virtual std::unique_ptr<EidData> GenerateBackgroundScanFilter(
       const std::vector<BeaconSeed>& scanning_device_beacon_seeds) const;