Android: remove device_data.h from browser/device_orientation/

content/browser/device_orientation/data_fetcher_impl_android.cc

 // Copyright (c) 2012 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/data_fetcher_impl_android.h"
 
 #include <string.h>
 
 #include "base/android/jni_android.h"
 #include "base/memory/singleton.h"
@@ skipping 117 matching lines @@
   device_motion_buffer_->data.rotationRateGamma = gamma;
   device_motion_buffer_->data.hasRotationRateGamma = true;
   device_motion_buffer_->seqlock.WriteEnd();
 
   if (!is_motion_buffer_ready_) {
     received_motion_data_[RECEIVED_MOTION_DATA_ROTATION_RATE] = 1;
     CheckMotionBufferReadyToRead();
   }
 }
 
-bool DataFetcherImplAndroid::Start(DeviceData::Type event_type) {
+bool DataFetcherImplAndroid::Start(EventType event_type) {
   DCHECK(!device_orientation_.is_null());
   return Java_DeviceMotionAndOrientation_start(
       AttachCurrentThread(), device_orientation_.obj(),
       reinterpret_cast<intptr_t>(this), static_cast<jint>(event_type),
       kInertialSensorIntervalMillis);
 }
 
-void DataFetcherImplAndroid::Stop(DeviceData::Type event_type) {
+void DataFetcherImplAndroid::Stop(EventType event_type) {
   DCHECK(!device_orientation_.is_null());
   Java_DeviceMotionAndOrientation_stop(
       AttachCurrentThread(), device_orientation_.obj(),
       static_cast<jint>(event_type));
 }
 
 int DataFetcherImplAndroid::GetNumberActiveDeviceMotionSensors() {
   DCHECK(!device_orientation_.is_null());
   return Java_DeviceMotionAndOrientation_getNumberActiveDeviceMotionSensors(
       AttachCurrentThread(), device_orientation_.obj());
 }
 
 
 // ----- Shared memory API methods
 
 // --- Device Motion
 
 bool DataFetcherImplAndroid::StartFetchingDeviceMotionData(
     DeviceMotionHardwareBuffer* buffer) {
   DCHECK(buffer);
   {
     base::AutoLock autolock(motion_buffer_lock_);
     device_motion_buffer_ = buffer;
     ClearInternalMotionBuffers();
   }
-  bool success = Start(DeviceData::kTypeMotion);
+  bool success = Start(kTypeMotion);
 
   // If no motion data can ever be provided, the number of active device motion
   // sensors will be zero. In that case flag the shared memory buffer
   // as ready to read, as it will not change anyway.
   number_active_device_motion_sensors_ = GetNumberActiveDeviceMotionSensors();
   {
     base::AutoLock autolock(motion_buffer_lock_);
     CheckMotionBufferReadyToRead();
   }
   return success;
 }
 
 void DataFetcherImplAndroid::StopFetchingDeviceMotionData() {
-  Stop(DeviceData::kTypeMotion);
+  Stop(kTypeMotion);
   {
     base::AutoLock autolock(motion_buffer_lock_);
     if (device_motion_buffer_) {
       ClearInternalMotionBuffers();
       device_motion_buffer_ = NULL;
     }
   }
 }
 
 void DataFetcherImplAndroid::CheckMotionBufferReadyToRead() {
@@ skipping 41 matching lines @@
   is_orientation_buffer_ready_ = ready;
 }
 
 bool DataFetcherImplAndroid::StartFetchingDeviceOrientationData(
     DeviceOrientationHardwareBuffer* buffer) {
   DCHECK(buffer);
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     device_orientation_buffer_ = buffer;
   }
-  bool success = Start(DeviceData::kTypeOrientation);
+  bool success = Start(kTypeOrientation);
 
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     // If Start() was unsuccessful then set the buffer ready flag to true
     // to start firing all-null events.
     SetOrientationBufferReadyStatus(!success);
   }
 
   if (!success)
     updateRotationVectorHistogram(false);
 
   return success;
 }
 
 void DataFetcherImplAndroid::StopFetchingDeviceOrientationData() {
-  Stop(DeviceData::kTypeOrientation);
+  Stop(kTypeOrientation);
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     if (device_orientation_buffer_) {
       SetOrientationBufferReadyStatus(false);
       device_orientation_buffer_ = NULL;
     }
   }
 }
 
 }  // namespace content