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

services/device/generic_sensor/platform_sensor.h

Index: services/device/generic_sensor/platform_sensor.h
diff --git a/device/generic_sensor/platform_sensor.h b/services/device/generic_sensor/platform_sensor.h
similarity index 88%
rename from device/generic_sensor/platform_sensor.h
rename to services/device/generic_sensor/platform_sensor.h
index 94629a552b9d9abe55556bce46e78145afa448c5..1e3847e0e9a47080f0736f4d95565c8003778ffe 100644
--- a/device/generic_sensor/platform_sensor.h
+++ b/services/device/generic_sensor/platform_sensor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_
-#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_
+#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_
+#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_
 
 #include <list>
 #include <map>
@@ -13,10 +13,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/single_thread_task_runner.h"
-#include "device/generic_sensor/generic_sensor_export.h"
-#include "device/generic_sensor/public/cpp/sensor_reading.h"
-#include "device/generic_sensor/public/interfaces/sensor.mojom.h"
 #include "mojo/public/cpp/system/buffer.h"
+#include "services/device/public/cpp/generic_sensor/sensor_reading.h"
+#include "services/device/public/interfaces/sensor.mojom.h"
 
 namespace device {
 
@@ -25,8 +24,7 @@ class PlatformSensorConfiguration;
 
 // Base class for the sensors provided by the platform. Concrete instances of
 // this class are created by platform specific PlatformSensorProvider.
-class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensor
-    : public base::RefCountedThreadSafe<PlatformSensor> {
+class PlatformSensor : public base::RefCountedThreadSafe<PlatformSensor> {
  public:
   // The interface that must be implemented by PlatformSensor clients.
   class Client {
@@ -108,4 +106,4 @@ class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensor
 
 }  // namespace device
 
-#endif  // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_
+#endif  // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_