Rename device_orientation to device_sensors

content/browser/device_sensors/sensor_manager_android.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_orientation/sensor_manager_android.h"
+#include "content/browser/device_sensors/sensor_manager_android.h"
 
 #include <string.h>
 
 #include "base/android/jni_android.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
-#include "content/browser/device_orientation/inertial_sensor_consts.h"
-#include "jni/DeviceMotionAndOrientation_jni.h"
+#include "content/browser/device_sensors/inertial_sensor_consts.h"
+#include "jni/DeviceSensors_jni.h"
 
 using base::android::AttachCurrentThread;
 
 namespace {
 
 static void updateRotationVectorHistogram(bool value) {
   UMA_HISTOGRAM_BOOLEAN("InertialSensor.RotationVectorAndroidAvailable", value);
 }
 
 }
 
 namespace content {
 
 SensorManagerAndroid::SensorManagerAndroid()
     : number_active_device_motion_sensors_(0),
       device_motion_buffer_(NULL),
       device_orientation_buffer_(NULL),
       is_motion_buffer_ready_(false),
       is_orientation_buffer_ready_(false) {
   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   device_orientation_.Reset(
-      Java_DeviceMotionAndOrientation_getInstance(
+      Java_DeviceSensors_getInstance(
           AttachCurrentThread(),
           base::android::GetApplicationContext()));
 }
 
 SensorManagerAndroid::~SensorManagerAndroid() {
 }
 
 bool SensorManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
@@ skipping 86 matching lines @@
   device_motion_buffer_->seqlock.WriteEnd();
 
   if (!is_motion_buffer_ready_) {
     received_motion_data_[RECEIVED_MOTION_DATA_ROTATION_RATE] = 1;
     CheckMotionBufferReadyToRead();
   }
 }
 
 bool SensorManagerAndroid::Start(EventType event_type) {
   DCHECK(!device_orientation_.is_null());
-  return Java_DeviceMotionAndOrientation_start(
+  return Java_DeviceSensors_start(
       AttachCurrentThread(), device_orientation_.obj(),
       reinterpret_cast<intptr_t>(this), static_cast<jint>(event_type),
       kInertialSensorIntervalMillis);
 }
 
 void SensorManagerAndroid::Stop(EventType event_type) {
   DCHECK(!device_orientation_.is_null());
-  Java_DeviceMotionAndOrientation_stop(
+  Java_DeviceSensors_stop(
       AttachCurrentThread(), device_orientation_.obj(),
       static_cast<jint>(event_type));
 }
 
 int SensorManagerAndroid::GetNumberActiveDeviceMotionSensors() {
   DCHECK(!device_orientation_.is_null());
-  return Java_DeviceMotionAndOrientation_getNumberActiveDeviceMotionSensors(
+  return Java_DeviceSensors_getNumberActiveDeviceMotionSensors(
       AttachCurrentThread(), device_orientation_.obj());
 }
 
 
 // ----- Shared memory API methods
 
 // --- Device Motion
 
 bool SensorManagerAndroid::StartFetchingDeviceMotionData(
     DeviceMotionHardwareBuffer* buffer) {
@@ skipping 99 matching lines @@
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     if (device_orientation_buffer_) {
       SetOrientationBufferReadyStatus(false);
       device_orientation_buffer_ = NULL;
     }
   }
 }
 
 }  // namespace content