Rename device_orientation to device_sensors

content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java

Index: content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
similarity index 97%
rename from content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
rename to content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
index be73f8c0ab6d84da452435d12b8b6b51e9f68e32..cca00db2ae592ed72ebc39cf645e687ae56464f4 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
@@ -29,7 +29,7 @@ import java.util.concurrent.Callable;
  * Android implementation of the device motion and orientation APIs.
  */
 @JNINamespace("content")
-class DeviceMotionAndOrientation implements SensorEventListener {
+class DeviceSensors implements SensorEventListener {
 
     private static final String TAG = "DeviceMotionAndOrientation";
 
@@ -57,12 +57,12 @@ class DeviceMotionAndOrientation implements SensorEventListener {
     private SensorManagerProxy mSensorManagerProxy;
 
     // The only instance of that class and its associated lock.
-    private static DeviceMotionAndOrientation sSingleton;
+    private static DeviceSensors sSingleton;
     private static Object sSingletonLock = new Object();
 
     /**
      * constants for using in JNI calls, also see
-     * content/browser/device_orientation/sensor_manager_android.cc
+     * content/browser/device_sensors/sensor_manager_android.cc
      */
     static final int DEVICE_ORIENTATION = 0;
     static final int DEVICE_MOTION = 1;
@@ -80,7 +80,7 @@ class DeviceMotionAndOrientation implements SensorEventListener {
     boolean mDeviceMotionIsActive = false;
     boolean mDeviceOrientationIsActive = false;
 
-    protected DeviceMotionAndOrientation(Context context) {
+    protected DeviceSensors(Context context) {
         mAppContext = context.getApplicationContext();
     }
 
@@ -440,10 +440,10 @@ class DeviceMotionAndOrientation implements SensorEventListener {
     }
 
     @CalledByNative
-    static DeviceMotionAndOrientation getInstance(Context appContext) {
+    static DeviceSensors getInstance(Context appContext) {
         synchronized (sSingletonLock) {
             if (sSingleton == null) {
-                sSingleton = new DeviceMotionAndOrientation(appContext);
+                sSingleton = new DeviceSensors(appContext);
             }
             return sSingleton;
         }
@@ -451,7 +451,7 @@ class DeviceMotionAndOrientation implements SensorEventListener {
 
     /**
      * Native JNI calls,
-     * see content/browser/device_orientation/sensor_manager_android.cc
+     * see content/browser/device_sensors/sensor_manager_android.cc
      */
 
     /**