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

chromeos/components/tether/ble_scanner_unittest.cc

 // 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.
 
 #include "chromeos/components/tether/ble_scanner.h"
 
 #include "base/logging.h"
 #include "chromeos/components/tether/ble_constants.h"
 #include "chromeos/components/tether/mock_local_device_data_provider.h"
 #include "components/cryptauth/mock_foreground_eid_generator.h"
@@ skipping 83 matching lines @@
 const std::string fake_beacon_seed1_data = "fakeBeaconSeed1Data";
 const int64_t fake_beacon_seed1_start_ms = current_eid_start_ms;
 const int64_t fake_beacon_seed1_end_ms = current_eid_end_ms;
 
 const std::string fake_beacon_seed2_data = "fakeBeaconSeed2Data";
 const int64_t fake_beacon_seed2_start_ms = adjacent_eid_start_ms;
 const int64_t fake_beacon_seed2_end_ms = adjacent_eid_end_ms;
 
 std::unique_ptr<cryptauth::ForegroundEidGenerator::EidData>
 CreateFakeBackgroundScanFilter() {
-  cryptauth::ForegroundEidGenerator::DataWithTimestamp current(
-      current_eid_data, current_eid_start_ms, current_eid_end_ms);
+  cryptauth::DataWithTimestamp current(current_eid_data, current_eid_start_ms,
+                                       current_eid_end_ms);
 
-  std::unique_ptr<cryptauth::ForegroundEidGenerator::DataWithTimestamp>
-      adjacent = base::MakeUnique<
-          cryptauth::ForegroundEidGenerator::DataWithTimestamp>(
+  std::unique_ptr<cryptauth::DataWithTimestamp> adjacent =
+      base::MakeUnique<cryptauth::DataWithTimestamp>(
           adjacent_eid_data, adjacent_eid_start_ms, adjacent_eid_end_ms);
 
   return base::MakeUnique<cryptauth::ForegroundEidGenerator::EidData>(
       current, std::move(adjacent));
 }
 
 std::vector<cryptauth::BeaconSeed> CreateFakeBeaconSeeds() {
   cryptauth::BeaconSeed seed1;
   seed1.set_data(fake_beacon_seed1_data);
   seed1.set_start_time_millis(fake_beacon_seed1_start_ms);
@@ skipping 437 matching lines @@
   // Unregister device.
   EXPECT_TRUE(ble_scanner_->IsDeviceRegistered(test_devices_[0].GetDeviceId()));
   EXPECT_TRUE(ble_scanner_->UnregisterScanFilterForDevice(test_devices_[0]));
   EXPECT_FALSE(
       ble_scanner_->IsDeviceRegistered(test_devices_[0].GetDeviceId()));
 }
 
 }  // namespace tether
 
 }  // namespace chromeos