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

services/device/generic_sensor/platform_sensor_reader_win.cc

Index: services/device/generic_sensor/platform_sensor_reader_win.cc
diff --git a/device/generic_sensor/platform_sensor_reader_win.cc b/services/device/generic_sensor/platform_sensor_reader_win.cc
similarity index 91%
rename from device/generic_sensor/platform_sensor_reader_win.cc
rename to services/device/generic_sensor/platform_sensor_reader_win.cc
index 89d7819053d3e1342522ff8cd0a0a10c5ac4d828..f2473b2cfeef020d40f78c55ec2da3b2a5acdcfb 100644
--- a/device/generic_sensor/platform_sensor_reader_win.cc
+++ b/services/device/generic_sensor/platform_sensor_reader_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/generic_sensor/platform_sensor_reader_win.h"
+#include "services/device/generic_sensor/platform_sensor_reader_win.h"
 
 #include <Sensors.h>
 
@@ -12,9 +12,9 @@
 #include "base/time/time.h"
 #include "base/win/iunknown_impl.h"
 #include "base/win/scoped_propvariant.h"
-#include "device/generic_sensor/generic_sensor_consts.h"
-#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h"
-#include "device/generic_sensor/public/cpp/sensor_reading.h"
+#include "services/device/generic_sensor/generic_sensor_consts.h"
+#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h"
+#include "services/device/public/cpp/generic_sensor/sensor_reading.h"
 
 namespace device {
 
@@ -104,31 +104,31 @@ std::unique_ptr<ReaderInitParams> CreateAccelerometerReaderInitParams() {
 std::unique_ptr<ReaderInitParams> CreateGyroscopeReaderInitParams() {
   auto params = base::MakeUnique<ReaderInitParams>();
   params->sensor_type_id = SENSOR_TYPE_GYROMETER_3D;
-  params->reader_func = base::Bind([](ISensorDataReport& report,
-                                      SensorReading& reading) {
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-    if (!GetReadingValueForProperty(
-            SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report,
-            &x) ||
-        !GetReadingValueForProperty(
-            SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report,
-            &y) ||
-        !GetReadingValueForProperty(
-            SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report,
-            &z)) {
-      return E_FAIL;
-    }
+  params->reader_func =
+      base::Bind([](ISensorDataReport& report, SensorReading& reading) {
+        double x = 0.0;
+        double y = 0.0;
+        double z = 0.0;
+        if (!GetReadingValueForProperty(
+                SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report,
+                &x) ||
+            !GetReadingValueForProperty(
+                SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report,
+                &y) ||
+            !GetReadingValueForProperty(
+                SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report,
+                &z)) {
+          return E_FAIL;
+        }
 
-    // Windows uses coordinate system where Z axis points down from device
-    // screen, therefore, using right hand notation, we have to reverse
-    // sign for each axis. Values are converted from deg to rad.
-    reading.values[0] = -x * kRadiansInDegrees;
-    reading.values[1] = -y * kRadiansInDegrees;
-    reading.values[2] = -z * kRadiansInDegrees;
-    return S_OK;
-  });
+        // Windows uses coordinate system where Z axis points down from device
+        // screen, therefore, using right hand notation, we have to reverse
+        // sign for each axis. Values are converted from deg to rad.
+        reading.values[0] = -x * kRadiansInDegrees;
+        reading.values[1] = -y * kRadiansInDegrees;
+        reading.values[2] = -z * kRadiansInDegrees;
+        return S_OK;
+      });
   return params;
 }