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

components/proximity_auth/bluetooth_low_energy_connection_finder_unittest.cc

 // Copyright 2015 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 "components/proximity_auth/bluetooth_low_energy_connection_finder.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 33 matching lines @@
 namespace proximity_auth {
 namespace {
 
 const char kBLEGattServiceUUID[] = "b3b7e28e-a000-3e17-bd86-6e97b9e28c11";
 const char kAdvertisementUUID[] = "0000fe50-0000-1000-8000-00805f9b34fb";
 const int8_t kRssi = -30;
 const char kEidForPreviousTimeQuantum[] = "\x12\x34";
 const char kEidForCurrentTimeQuantum[] = "\xab\xcd";
 const char kEidForNextTimeQuantum[] = "\x56\x78";
 const char kWrongEid[] = "\xff\xff";
+const int64_t kEidPeriodMs = 60 * 1000 * 15;

[Kyle Horimoto, 2017/04/28 22:19:17]

nit: Use a constant kEidPeriodMinutes = 15 and use
base::TimeDelta::FromMinutes() when you use it.

[Tim Song, 2017/04/29 01:07:50]

It seems cleaner to use milliseconds directly as I would need to do this
conversion quite a few times in the code otherwise.

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

Alright, can you add a "15 minutes" comment then?

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

Done.

 
 std::vector<cryptauth::BeaconSeed> CreateBeaconSeeds() {
   std::vector<cryptauth::BeaconSeed> beacon_seeds;
   cryptauth::BeaconSeed seed;
   seed.set_data("\xab\xcd");
   seed.set_start_time_millis(0);
   seed.set_end_time_millis(10000000);
   beacon_seeds.push_back(seed);
   return beacon_seeds;
 }
 
 class MockBluetoothLowEnergyConnectionFinder;
 class FakeEidGenerator : public cryptauth::BackgroundEidGenerator {
  public:
   FakeEidGenerator(MockBluetoothLowEnergyConnectionFinder* connection_finder)
       : connection_finder_(connection_finder) {}
   ~FakeEidGenerator() override {}
 
-  std::vector<std::string> GenerateNearestEids(
+  std::vector<cryptauth::EidDataWithTimestamp> GenerateNearestEids(
       const std::vector<cryptauth::BeaconSeed>& beacon_seed) const override;
 
  private:
   MockBluetoothLowEnergyConnectionFinder* connection_finder_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeEidGenerator);
 };
 
 class MockBluetoothLowEnergyConnectionFinder
     : public BluetoothLowEnergyConnectionFinder {
@@ skipping 41 matching lines @@
   }
 
  private:
   std::vector<std::string> nearest_eids_;
 
   DISALLOW_COPY_AND_ASSIGN(MockBluetoothLowEnergyConnectionFinder);
 };
 
 // Not declared in-line due to dependency on
 // MockBluetoothLowEnergyConnectionFinder.
-std::vector<std::string> FakeEidGenerator::GenerateNearestEids(
+std::vector<cryptauth::EidDataWithTimestamp>
+FakeEidGenerator::GenerateNearestEids(
     const std::vector<cryptauth::BeaconSeed>& beacon_seed) const {
-  return connection_finder_->nearest_eids();
+  std::vector<std::string> nearest_eids = connection_finder_->nearest_eids();
+
+  std::vector<cryptauth::EidDataWithTimestamp> eid_data_with_timestamps;
+  int64_t start_of_period_ms = 0;
+  for (const std::string& eid : nearest_eids) {
+    eid_data_with_timestamps.push_back(cryptauth::EidDataWithTimestamp(
+        eid, start_of_period_ms, start_of_period_ms + kEidPeriodMs));
+    start_of_period_ms += kEidPeriodMs;
+  }
+
+  return eid_data_with_timestamps;
 }
 
 }  // namespace
 
 class ProximityAuthBluetoothLowEnergyConnectionFinderTest
     : public testing::Test {
  protected:
   ProximityAuthBluetoothLowEnergyConnectionFinderTest()
       : adapter_(new NiceMock<device::MockBluetoothAdapter>),
         connection_callback_(
@@ skipping 280 matching lines @@
   // Completing the connection.
   base::RunLoop run_loop;
   ASSERT_FALSE(last_found_connection_);
   connection->SetStatus(cryptauth::Connection::IN_PROGRESS);
   connection->SetStatus(cryptauth::Connection::CONNECTED);
   run_loop.RunUntilIdle();
   EXPECT_TRUE(last_found_connection_);
 }
 
 }  // namespace proximity_auth