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

services/device/BUILD.gn

Index: services/device/BUILD.gn
diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
index 97259a916c9eaa2dba43fac7c57818b7ec83acb1..8d5d4ee76caf44b8fcb1f2a0af469789f00b8fc9 100644
--- a/services/device/BUILD.gn
+++ b/services/device/BUILD.gn
@@ -25,12 +25,12 @@
 
   deps = [
     "//base",
+    "//device/generic_sensor",
     "//device/nfc:mojo_bindings",
     "//device/sensors",
     "//device/sensors/public/interfaces",
     "//device/wake_lock",
     "//services/device/fingerprint",
-    "//services/device/generic_sensor",
     "//services/device/power_monitor",
     "//services/device/public/cpp:device_features",
     "//services/device/public/interfaces",
@@ -54,16 +54,12 @@
   }
 }
 
-is_linux_without_udev = is_linux && !use_udev
-
 source_set("tests") {
   testonly = true
 
   sources = [
     "battery/battery_status_manager_win_unittest.cc",
     "battery/battery_status_service_unittest.cc",
-    "generic_sensor/platform_sensor_and_provider_unittest_win.cc",
-    "generic_sensor/platform_sensor_provider_unittest.cc",
     "power_monitor/power_monitor_message_broadcaster_unittest.cc",
     "public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc",
     "vibration/vibration_manager_impl_unittest.cc",
@@ -74,18 +70,11 @@
     "//base",
     "//base/test:test_support",
     "//mojo/public/cpp/bindings",
-    "//services/device/generic_sensor",
-    "//services/device/generic_sensor:testing",
     "//services/device/power_monitor",
     "//services/device/public/cpp/power_monitor",
     "//testing/gmock",
     "//testing/gtest",
   ]
-
-  if (!is_linux_without_udev) {
-    sources +=
-        [ "generic_sensor/platform_sensor_and_provider_unittest_linux.cc" ]
-  }
 
   if (is_linux && !is_chromeos && use_dbus) {
     sources += [ "battery/battery_status_manager_linux_unittest.cc" ]
@@ -113,14 +102,6 @@
     deps += [
       "//services/device/battery",
       "//services/device/vibration",
-    ]
-  }
-
-  if (is_win) {
-    # Needed for "generic_sensor/platform_sensor_and_provider_unittest_win.cc"
-    libs = [
-      "propsys.lib",
-      "sensorsapi.lib",
     ]
   }
 }
@@ -190,7 +171,6 @@
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
       "//services/device/battery/android:battery_monitor_java",
-      "//services/device/generic_sensor:java",
       "//services/device/public/interfaces:interfaces_java",
       "//services/device/screen_orientation:java",
       "//services/device/time_zone_monitor:java",