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

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

Index: services/device/public/cpp/generic_sensor/sensor_struct_traits.h
diff --git a/device/generic_sensor/public/cpp/sensor_struct_traits.h b/services/device/public/cpp/generic_sensor/sensor_struct_traits.h
similarity index 61%
rename from device/generic_sensor/public/cpp/sensor_struct_traits.h
rename to services/device/public/cpp/generic_sensor/sensor_struct_traits.h
index 0514c1e2bab176ae3add30e319585d210bce10e9..e15f8ee03be7db0307abb5c3f2e208e9394eb108 100644
--- a/device/generic_sensor/public/cpp/sensor_struct_traits.h
+++ b/services/device/public/cpp/generic_sensor/sensor_struct_traits.h
@@ -2,11 +2,11 @@
 // 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_INTERFACES_SENSOR_STRUCT_TRAITS_H_
-#define DEVICE_GENERIC_SENSOR_PUBLIC_INTERFACES_SENSOR_STRUCT_TRAITS_H_
+#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_STRUCT_TRAITS_H_
+#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_STRUCT_TRAITS_H_
 
-#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h"
-#include "device/generic_sensor/public/interfaces/sensor.mojom.h"
+#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h"
+#include "services/device/public/interfaces/sensor.mojom.h"
 
 namespace mojo {
 
@@ -23,4 +23,4 @@ struct StructTraits<device::mojom::SensorConfigurationDataView,
 
 }  // namespace mojo
 
-#endif  // DEVICE_GENERIC_SENSOR_PUBLIC_INTERFACES_SENSOR_STRUCT_TRAITS_H_
+#endif  // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_STRUCT_TRAITS_H_