[DeviceService] Move //device/time_zone_monitor to //services/device

services/device/time_zone_monitor/BUILD.gn

Index: services/device/time_zone_monitor/BUILD.gn
diff --git a/device/time_zone_monitor/BUILD.gn b/services/device/time_zone_monitor/BUILD.gn
similarity index 71%
rename from device/time_zone_monitor/BUILD.gn
rename to services/device/time_zone_monitor/BUILD.gn
index 9369844cadd2604afe98b1e352f7dcf353564194..ecef1fc39f5ce69abdf7443fbbb6a443622cf027 100644
--- a/device/time_zone_monitor/BUILD.gn
+++ b/services/device/time_zone_monitor/BUILD.gn
@@ -8,23 +8,20 @@ if (is_android) {
   import("//build/config/android/rules.gni")  # For generate_jni().
 }
 
-component("time_zone_monitor") {
+source_set("time_zone_monitor") {
+  visibility = [ "//services/device:lib" ]
+
   sources = [
-    "android/time_zone_monitor_jni_registrar.cc",
-    "android/time_zone_monitor_jni_registrar.h",
     "time_zone_monitor.cc",
     "time_zone_monitor.h",
     "time_zone_monitor_android.cc",
     "time_zone_monitor_android.h",
     "time_zone_monitor_chromeos.cc",
-    "time_zone_monitor_export.h",
     "time_zone_monitor_linux.cc",
     "time_zone_monitor_mac.mm",
     "time_zone_monitor_win.cc",
   ]
 
-  defines = [ "DEVICE_TIME_ZONE_MONITOR_IMPLEMENTATION" ]
-
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
@@ -32,10 +29,14 @@ component("time_zone_monitor") {
   ]
 
   public_deps = [
-    "//device/time_zone_monitor/public/interfaces",
+    "//services/device/public/interfaces",
   ]
 
   if (is_android) {
+    sources += [
+      "android/time_zone_monitor_jni_registrar.cc",
+      "android/time_zone_monitor_jni_registrar.h",
+    ]
     deps += [ ":time_zone_monitor_jni_headers" ]
   }
 
@@ -54,16 +55,10 @@ component("time_zone_monitor") {
 
 if (is_android) {
   generate_jni("time_zone_monitor_jni_headers") {
+    visibility = [ ":time_zone_monitor" ]
     sources = [
       "android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java",
     ]
     jni_package = "time_zone_monitor"
   }
-
-  android_library("java") {
-    java_files = [ "android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java" ]
-    deps = [
-      "//base:base_java",
-    ]
-  }
 }