| Index: content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| index 1b62abab137ada058178e45301d81331c5179df0..18f419fb26bee8334e6847c774f8d9965703816c 100644
|
| --- a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| +++ b/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| @@ -67,7 +67,7 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
|
| DeviceMotionHardwareBuffer* buffer = GetMotionBuffer();
|
| ASSERT_TRUE(buffer);
|
| buffer->seqlock.WriteBegin();
|
| - buffer->data.interval = kInertialSensorIntervalMillis;
|
| + buffer->data.interval = kInertialSensorIntervalMicroseconds / 1000.;
|
| buffer->seqlock.WriteEnd();
|
| updated_motion_.Signal();
|
| }
|
| @@ -343,8 +343,8 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesStartMotion) {
|
| EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION);
|
|
|
| - EXPECT_EQ(kInertialSensorIntervalMillis,
|
| - fake_data_fetcher.GetMotionBuffer()->data.interval);
|
| + EXPECT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
|
| + fake_data_fetcher.GetMotionBuffer()->data.interval);
|
|
|
| fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
|
| fake_data_fetcher.WaitForStop(CONSUMER_TYPE_MOTION);
|
| @@ -388,8 +388,8 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) {
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION);
|
| fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_MOTION);
|
|
|
| - EXPECT_EQ(kInertialSensorIntervalMillis,
|
| - fake_data_fetcher.GetMotionBuffer()->data.interval);
|
| + EXPECT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
|
| + fake_data_fetcher.GetMotionBuffer()->data.interval);
|
|
|
| fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
|
| fake_data_fetcher.WaitForStop(CONSUMER_TYPE_MOTION);
|
| @@ -452,8 +452,8 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotionAndOrientation) {
|
| fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_MOTION);
|
|
|
| EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha);
|
| - EXPECT_EQ(kInertialSensorIntervalMillis,
|
| - fake_data_fetcher.GetMotionBuffer()->data.interval);
|
| + EXPECT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
|
| + fake_data_fetcher.GetMotionBuffer()->data.interval);
|
|
|
| fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
|
| fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
|
|
|