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

services/device/generic_sensor/android/sensors_jni_registrar.h

Index: services/device/generic_sensor/android/sensors_jni_registrar.h
diff --git a/device/generic_sensor/android/sensors_jni_registrar.h b/services/device/generic_sensor/android/sensors_jni_registrar.h
similarity index 60%
rename from device/generic_sensor/android/sensors_jni_registrar.h
rename to services/device/generic_sensor/android/sensors_jni_registrar.h
index e10738d61601a771a113dab4c5ee8d657033e734..c16a9e9af0f75f9dd2991e22afdd38d4835a17c5 100644
--- a/device/generic_sensor/android/sensors_jni_registrar.h
+++ b/services/device/generic_sensor/android/sensors_jni_registrar.h
@@ -2,13 +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_ANDROID_SENSORS_JNI_REGISTRAR_H_
-#define DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_
+#ifndef SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_
+#define SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
-#include "device/generic_sensor/generic_sensor_export.h"
-
 namespace device {
 namespace android {
 
@@ -16,9 +14,9 @@ namespace android {
 // See https://www.chromium.org/developers/design-documents/android-jni
 //
 // Must be called before classes in the Sensors module are used.
-bool DEVICE_GENERIC_SENSOR_EXPORT RegisterSensorsJni(JNIEnv* env);
+bool RegisterSensorsJni(JNIEnv* env);
 
 }  // namespace android
 }  // namespace device
 
-#endif  // DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_
+#endif  // SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_