Android: remove device_data.h from browser/device_orientation/

content/browser/device_orientation/data_fetcher_impl_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_IMPL_ANDROID_H_
 #define CHROME_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_IMPL_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "content/browser/device_orientation/device_data.h"
 #include "content/common/content_export.h"
 #include "content/common/device_orientation/device_motion_hardware_buffer.h"
 #include "content/common/device_orientation/device_orientation_hardware_buffer.h"
 
 template<typename T> struct DefaultSingletonTraits;
 
 namespace content {
 
 // Android implementation of Device Orientation API.
 //
@@ skipping 14 matching lines @@
   // Called from Java via JNI.
   void GotOrientation(JNIEnv*, jobject,
                       double alpha, double beta, double gamma);
   void GotAcceleration(JNIEnv*, jobject,
                        double x, double y, double z);
   void GotAccelerationIncludingGravity(JNIEnv*, jobject,
                                        double x, double y, double z);
   void GotRotationRate(JNIEnv*, jobject,
                        double alpha, double beta, double gamma);
 
-  virtual bool Start(DeviceData::Type event_type);
-  virtual void Stop(DeviceData::Type event_type);
-
   // Shared memory related methods.
   bool StartFetchingDeviceMotionData(DeviceMotionHardwareBuffer* buffer);
   void StopFetchingDeviceMotionData();
 
   bool StartFetchingDeviceOrientationData(
       DeviceOrientationHardwareBuffer* buffer);
   void StopFetchingDeviceOrientationData();
 
  protected:
+  enum EventType {
+    // These constants should match DEVICE_ORIENTATION and DEVICE_MOTION
+    // constants in content/public/android/java/src/org/chromium/content/
+    // browser/DeviceMotionAndOrientation.java
+    kTypeOrientation = 0,
+    kTypeMotion = 1
+  };
+
   DataFetcherImplAndroid();
   virtual ~DataFetcherImplAndroid();
 
+  virtual bool Start(EventType event_type);
+  virtual void Stop(EventType event_type);
   virtual int GetNumberActiveDeviceMotionSensors();
 
  private:
   friend struct DefaultSingletonTraits<DataFetcherImplAndroid>;
 
-  void CheckMotionBufferReadyToRead();
-  void SetMotionBufferReadyStatus(bool ready);
-  void ClearInternalMotionBuffers();
-
-  void SetOrientationBufferReadyStatus(bool ready);
-
   enum {
     RECEIVED_MOTION_DATA_ACCELERATION = 0,
     RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY = 1,
     RECEIVED_MOTION_DATA_ROTATION_RATE = 2,
     RECEIVED_MOTION_DATA_MAX = 3,
   };
 
+  void CheckMotionBufferReadyToRead();
+  void SetMotionBufferReadyStatus(bool ready);
+  void ClearInternalMotionBuffers();
+
+  void SetOrientationBufferReadyStatus(bool ready);
+
   // The Java provider of orientation info.
   base::android::ScopedJavaGlobalRef<jobject> device_orientation_;
   int number_active_device_motion_sensors_;
   int received_motion_data_[RECEIVED_MOTION_DATA_MAX];
   DeviceMotionHardwareBuffer* device_motion_buffer_;
   DeviceOrientationHardwareBuffer* device_orientation_buffer_;
   bool is_motion_buffer_ready_;
   bool is_orientation_buffer_ready_;
 
   base::Lock motion_buffer_lock_;
   base::Lock orientation_buffer_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(DataFetcherImplAndroid);
 };
 
 }  // namespace content
 
 #endif  // CHROME_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_IMPL_ANDROID_H_