Increase device orientation event frequency to 60 Hz. Change constants

content/browser/device_sensors/sensor_manager_android_unittest.cc

 // Copyright 2014 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 "content/browser/device_sensors/sensor_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/device_sensors/inertial_sensor_consts.h"
@@ skipping 68 matching lines @@
   ASSERT_TRUE(motion_buffer_->data.hasAccelerationIncludingGravityZ);
 
   sensorManager.GotRotationRate(0, 0, 7, 8, 9);
   ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
   ASSERT_EQ(7, motion_buffer_->data.rotationRateAlpha);
   ASSERT_TRUE(motion_buffer_->data.hasRotationRateAlpha);
   ASSERT_EQ(8, motion_buffer_->data.rotationRateBeta);
   ASSERT_TRUE(motion_buffer_->data.hasRotationRateBeta);
   ASSERT_EQ(9, motion_buffer_->data.rotationRateGamma);
   ASSERT_TRUE(motion_buffer_->data.hasRotationRateGamma);
-  ASSERT_EQ(kInertialSensorIntervalMillis, motion_buffer_->data.interval);
+  ASSERT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
+            motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
   sensorManager.SetNumberActiveDeviceMotionSensors(2);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotAcceleration(0, 0, 1, 2, 3);
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotAccelerationIncludingGravity(0, 0, 1, 2, 3);
   ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
-  ASSERT_EQ(kInertialSensorIntervalMillis, motion_buffer_->data.interval);
+  ASSERT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
+            motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
   sensorManager.SetNumberActiveDeviceMotionSensors(0);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
   ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
-  ASSERT_EQ(kInertialSensorIntervalMillis, motion_buffer_->data.interval);
+  ASSERT_EQ(kInertialSensorIntervalMicroseconds / 1000.,
+            motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
 
   sensorManager.StartFetchingDeviceOrientationData(orientation_buffer_.get());
@@ skipping 22 matching lines @@
   sensorManager.GotLight(0, 0, 100);
   ASSERT_EQ(100, light_buffer_->data.value);
 
   sensorManager.StopFetchingDeviceLightData();
   ASSERT_EQ(-1, light_buffer_->data.value);
 }
 
 }  // namespace
 
 }  // namespace content