[CrOS settings] Fix polymer_modulizer for os_settings_ui/

This CL is in preparation for enabling Polymer3 in ChromeOS settings
pages. It fixed issues in os_settings_ui/ folder that break
semi-automatic Polymer3 migration. These changes include adding missing
#cr_define_end comments to JS file which were missing them, as well as
making sure that files which use cr.define() include the entire file's
content within the cr.define() call, since this is required by Polymer3
conversion tools.

Bug: 1045266
Change-Id: Iaf3379cc76c4eab1efff139dd5d7542adf5f2293
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153338Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/master@{#760256}

chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn

@@ -34,26 +34,25 @@ js_library("os_settings_ui") {
 #  ]
 #}
 
-# TODO: Fix and re-enable
-#js_library("os_settings_ui.m") {
-#  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.m.js" ]
-#  deps = [
-#    # TODO: Fill those in.
-#  ]
-#  extra_deps = [ ":os_settings_ui_module" ]
-#}
+js_library("os_settings_ui.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_ui_module" ]
+}
 
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
   public_deps = [
     # TODO: Fix and re-enable
-    #":os_settings_ui_module"
+    ":os_settings_ui_module",
   ]
 }
-# TODO: Fix and re-enable
-#polymer_modulizer("os_settings_ui") {
-#  js_file = "os_settings_ui.js"
-#  html_file = "os_settings_ui.html"
-#  html_type = "dom-module"
-#}
+
+polymer_modulizer("os_settings_ui") {
+  js_file = "os_settings_ui.js"
+  html_file = "os_settings_ui.html"
+  html_type = "dom-module"
+}