Move //device/generic_sensor to be part of the internal implementation of the Device Service.

services/device/public/cpp/generic_sensor/sensor_reading.h

 // Copyright 2016 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 DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_
-#define DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_
+#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_
+#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_
 
 #include "device/base/synchronization/one_writer_seqlock.h"
-#include "device/generic_sensor/public/cpp/generic_sensor_public_export.h"
-#include "device/generic_sensor/public/interfaces/sensor.mojom.h"
+#include "services/device/public/interfaces/sensor.mojom.h"
 
 namespace device {
 
 // This class is guarantied to have a fixed size of 64 bits on every platform.
 // It is introduce to simplify sensors shared buffer memory calculation.
 template <typename Data>
 class SensorReadingField {
  public:
   static_assert(sizeof(Data) <= sizeof(int64_t),
                 "The field size must be <= 64 bits.");
@@ skipping 12 matching lines @@
   union Storage {
     int64_t unused;
     Data value;
     Storage() { new (&value) Data(); }
     ~Storage() { value.~Data(); }
   };
   Storage storage_;
 };
 
 // This structure represents sensor reading data: timestamp and 4 values.
-struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReading {
+struct SensorReading {
   SensorReading();
   ~SensorReading();
   SensorReading(const SensorReading& other);
   SensorReadingField<double> timestamp;
   constexpr static int kValuesCount = 4;
   // AMBIENT_LIGHT:
   // values[0]: ambient light level in SI lux units.
   //
   // PROXIMITY:
   // values[0]: proximity sensor distance measured in centimeters.
@@ skipping 40 matching lines @@
   // device in 3D space.
   // values[2]: z value of a quaternion representing the orientation of the
   // device in 3D space.
   // values[3]: w value of a quaternion representing the orientation of the
   // device in 3D space.
   SensorReadingField<double> values[kValuesCount];
 };
 
 // This structure represents sensor reading buffer: sensor reading and seqlock
 // for synchronization.
-struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReadingSharedBuffer {
+struct SensorReadingSharedBuffer {
   SensorReadingSharedBuffer();
   ~SensorReadingSharedBuffer();
   SensorReadingField<OneWriterSeqLock> seqlock;
   SensorReading reading;
 
   // Gets the shared reading buffer offset for the given sensor type.
   static uint64_t GetOffset(mojom::SensorType type);
 };
 
 }  // namespace device
 
-#endif  // DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_
+#endif  // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_