[sensors](CrOS/Linux) Fix calculations with offset

device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc

Index: device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
diff --git a/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
index 074e7b7801cdd2b666e3200dd29976ec454f3dce..bf3891197c94b635cd1be4ac3aa6bd1e61371de2 100644
--- a/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
+++ b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
@@ -550,10 +550,13 @@ TEST_F(PlatformSensorAndProviderLinuxTest,
   EXPECT_THAT(buffer->reading.values[1], scaling * sensor_values[1]);
   EXPECT_THAT(buffer->reading.values[2], scaling * sensor_values[2]);
 #else
-  double scaling = kAccelerometerScalingValue + kAccelerometerOffsetValue;
-  EXPECT_THAT(buffer->reading.values[0], -scaling * sensor_values[0]);
-  EXPECT_THAT(buffer->reading.values[1], -scaling * sensor_values[1]);
-  EXPECT_THAT(buffer->reading.values[2], -scaling * sensor_values[2]);
+  double scaling = kAccelerometerScalingValue;
+  EXPECT_THAT(buffer->reading.values[0],
+              -scaling * (sensor_values[0] + kAccelerometerOffsetValue));
+  EXPECT_THAT(buffer->reading.values[1],
+              -scaling * (sensor_values[1] + kAccelerometerOffsetValue));
+  EXPECT_THAT(buffer->reading.values[2],
+              -scaling * (sensor_values[2] + kAccelerometerOffsetValue));
 #endif
 }
 
@@ -604,10 +607,13 @@ TEST_F(PlatformSensorAndProviderLinuxTest, CheckGyroscopeReadingConversion) {
   EXPECT_THAT(buffer->reading.values[1], -scaling * sensor_values[1]);
   EXPECT_THAT(buffer->reading.values[2], -scaling * sensor_values[2]);
 #else
-  double scaling = kGyroscopeScalingValue + kGyroscopeOffsetValue;
-  EXPECT_THAT(buffer->reading.values[0], scaling * sensor_values[0]);
-  EXPECT_THAT(buffer->reading.values[1], scaling * sensor_values[1]);
-  EXPECT_THAT(buffer->reading.values[2], scaling * sensor_values[2]);
+  double scaling = kGyroscopeScalingValue;
+  EXPECT_THAT(buffer->reading.values[0],
+              scaling * (sensor_values[0] + kGyroscopeOffsetValue));
+  EXPECT_THAT(buffer->reading.values[1],
+              scaling * (sensor_values[1] + kGyroscopeOffsetValue));
+  EXPECT_THAT(buffer->reading.values[2],
+              scaling * (sensor_values[2] + kGyroscopeOffsetValue));
 #endif
 }
 
@@ -651,11 +657,13 @@ TEST_F(PlatformSensorAndProviderLinuxTest, CheckMagnetometerReadingConversion) {
 
   SensorReadingSharedBuffer* buffer =
       static_cast<SensorReadingSharedBuffer*>(mapping.get());
-  double scaling = (kMagnetometerScalingValue + kMagnetometerOffsetValue) *
-                   kMicroteslaInGauss;
-  EXPECT_THAT(buffer->reading.values[0], scaling * sensor_values[0]);
-  EXPECT_THAT(buffer->reading.values[1], scaling * sensor_values[1]);
-  EXPECT_THAT(buffer->reading.values[2], scaling * sensor_values[2]);
+  double scaling = kMagnetometerScalingValue * kMicroteslaInGauss;
+  EXPECT_THAT(buffer->reading.values[0],
+              scaling * (sensor_values[0] + kMagnetometerOffsetValue));
+  EXPECT_THAT(buffer->reading.values[1],
+              scaling * (sensor_values[1] + kMagnetometerOffsetValue));
+  EXPECT_THAT(buffer->reading.values[2],
+              scaling * (sensor_values[2] + kMagnetometerOffsetValue));
 }
 
 }  // namespace device