WebUI: Port ui/webui/resources/policy/ to Polymer3.

Specifically porting
 - cr_policy_indicator_behavior.js
 - cr_policy_indicator.js

This is in preparation of further Polymer3 migrations
(certificate manager, Settings).

Bug: 1042558
Change-Id: Ia2accbc62ac581eaafbdaaa038b5b92765f53bc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008017
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733845}

chrome/test/data/webui/BUILD.gn

@@ -35,7 +35,6 @@ js2gtest("interactive_ui_tests_js_webui") {
     "//chrome/browser/ui",
   ]
   data = [
-    "$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_action_menu_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_checkbox_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.m.js",
@@ -44,8 +43,9 @@ js2gtest("interactive_ui_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/iron_list_focus_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
+    "$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
+    "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
     "$root_gen_dir/chrome/test/data/webui/test_store.m.js",
     "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
   ]
@@ -185,12 +185,14 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lazy_render_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_link_row_tests.m.js",
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.m.js",
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_button_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_group_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_search_field_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js",
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js",

chrome/test/data/webui/cr_elements/BUILD.gn

@@ -19,6 +19,8 @@ js_modulizer("modulize") {
     "cr_input_test.js",
     "cr_lazy_render_tests.js",
     "cr_link_row_tests.js",
+    "cr_policy_indicator_tests.js",
+    "cr_policy_indicator_behavior_tests.js",
     "cr_radio_button_test.js",
     "cr_radio_group_test.js",
     "cr_search_field_tests.js",

chrome/test/data/webui/cr_elements/cr_elements_v3_browsertest.js

@@ -255,3 +255,28 @@ var CrElementsViewManagerV3Test = class extends CrElementsV3BrowserTest {
 TEST_F('CrElementsViewManagerV3Test', 'All', function() {
   mocha.run();
 });
+
+// eslint-disable-next-line no-var
+var CrElementsPolicyIndicatorV3Test = class extends CrElementsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://test?module=cr_elements/cr_policy_indicator_tests.m.js';
+  }
+};
+
+TEST_F('CrElementsPolicyIndicatorV3Test', 'All', function() {
+  mocha.run();
+});
+
+// eslint-disable-next-line no-var
+var CrElementsPolicyIndicatorBehaviorV3Test =
+    class extends CrElementsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://test?module=cr_elements/cr_policy_indicator_behavior_tests.m.js';
+  }
+};
+
+TEST_F('CrElementsPolicyIndicatorBehaviorV3Test', 'All', function() {
+  mocha.run();
+});

chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.js

@@ -3,6 +3,14 @@
 // found in the LICENSE file.
 
 /** @fileoverview Suite of tests for CrPolicyIndicatorBehavior. */
+
+// clang-format off
+// #import {CrPolicyIndicatorBehavior, CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.m.js';
+// #import {Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {isChromeOS} from 'chrome://resources/js/cr.m.js';
+// #import 'chrome://test/cr_elements/cr_policy_strings.js';
+// clang-format on
+
 suite('CrPolicyIndicatorBehavior', function() {
   suiteSetup(function() {
     Polymer({

chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.js

@@ -2,6 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
+// #import {CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.m.js';
+// #import 'chrome://resources/cr_elements/policy/cr_policy_indicator.m.js';
+// #import {isChromeOS} from 'chrome://resources/js/cr.m.js';
+// #import 'chrome://test/cr_elements/cr_policy_strings.js';
+// clang-format on
+
 /** @fileoverview Suite of tests for cr-policy-indicator. */
 suite('CrPolicyIndicator', function() {
   /** @type {!CrPolicyIndicatorElement|undefined} */

chrome/test/data/webui/cr_elements/cr_policy_strings.js

@@ -16,3 +16,6 @@ var CrPolicyStrings = CrPolicyStrings || {
   controlledSettingParent: 'parent',
   controlledSettingChildRestriction: 'Restricted for child',
 };
+
+// Necessary for tests residing within a JS module.
+window.CrPolicyStrings = CrPolicyStrings;

ui/webui/resources/cr_elements/BUILD.gn

@@ -181,7 +181,7 @@ group("polymer3_elements") {
     "cr_toolbar:cr_toolbar_search_field_module",
     "cr_toolbar:cr_toolbar_selection_overlay_module",
     "cr_view_manager:cr_view_manager_module",
-    "policy:cr_tooltip_icon_module",
+    "policy:polymer3_elements",
   ]
 
   if (is_chromeos) {

ui/webui/resources/cr_elements/policy/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
+import("../../tools/js_modulizer.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -65,15 +66,30 @@ if (is_chromeos) {
 js_library("cr_tooltip_icon") {
 }
 
-polymer_modulizer("cr_tooltip_icon") {
-  js_file = "cr_tooltip_icon.js"
-  html_file = "cr_tooltip_icon.html"
-  html_type = "dom-module"
-}
+# Polymer 3 autogenerated version
 
 js_type_check("closure_compile_module") {
   is_polymer3 = true
-  deps = [ ":cr_tooltip_icon.m" ]
+  deps = [
+    ":cr_policy_indicator.m",
+    ":cr_policy_indicator_behavior.m",
+    ":cr_tooltip_icon.m",
+  ]
+}
+
+js_library("cr_policy_indicator.m") {
+  sources = [ "$root_gen_dir/ui/webui/resources/cr_elements/policy/cr_policy_indicator.m.js" ]
+  deps = [
+    ":cr_policy_indicator_behavior.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+  extra_deps = [ ":cr_policy_indicator_module" ]
+}
+
+js_library("cr_policy_indicator_behavior.m") {
+  sources = [ "$root_gen_dir/ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.m.js" ]
+  deps = [ "//ui/webui/resources/js:assert.m" ]
+  extra_deps = [ ":modulize" ]
 }
 
 js_library("cr_tooltip_icon.m") {
@@ -85,3 +101,28 @@ js_library("cr_tooltip_icon.m") {
   ]
   extra_deps = [ ":cr_tooltip_icon_module" ]
 }
+
+group("polymer3_elements") {
+  deps = [
+    ":cr_policy_indicator_module",
+    ":cr_tooltip_icon_module",
+    ":modulize",
+  ]
+}
+
+polymer_modulizer("cr_policy_indicator") {
+  js_file = "cr_policy_indicator.js"
+  html_file = "cr_policy_indicator.html"
+  html_type = "dom-module"
+  auto_imports = [ "ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorBehavior,CrPolicyIndicatorType" ]
+}
+
+polymer_modulizer("cr_tooltip_icon") {
+  js_file = "cr_tooltip_icon.js"
+  html_file = "cr_tooltip_icon.html"
+  html_type = "dom-module"
+}
+
+js_modulizer("modulize") {
+  input_files = [ "cr_policy_indicator_behavior.js" ]
+}

ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.js

@@ -8,6 +8,8 @@
  * rework the "policy" naming scheme throughout this directory.
  */
 
+// #import {assertNotReached} from 'chrome://resources/js/assert.m.js';
+
 /**
  * Strings required for policy indicators. These must be set at runtime.
  * Chrome OS only strings may be undefined.
@@ -28,7 +30,7 @@
 var CrPolicyStrings;
 
 /** @enum {string} */
-const CrPolicyIndicatorType = {
+/* #export */ const CrPolicyIndicatorType = {
   DEVICE_POLICY: 'devicePolicy',
   EXTENSION: 'extension',
   NONE: 'none',
@@ -41,7 +43,7 @@ const CrPolicyIndicatorType = {
 };
 
 /** @polymerBehavior */
-const CrPolicyIndicatorBehavior = {
+/* #export */ const CrPolicyIndicatorBehavior = {
   // Properties exposed to all policy indicators.
   properties: {
     /**
@@ -121,9 +123,11 @@ const CrPolicyIndicatorBehavior = {
    * @return {string} The tooltip text for |type|.
    */
   getIndicatorTooltip(type, name, opt_matches) {
-    if (!CrPolicyStrings) {
+    if (!window['CrPolicyStrings']) {
       return '';
     }  // Tooltips may not be defined, e.g. in OOBE.
+
+    CrPolicyStrings = window['CrPolicyStrings'];
     switch (type) {
       case CrPolicyIndicatorType.EXTENSION:
         return name.length > 0 ?

ui/webui/resources/cr_elements_resources_v3.grdp

@@ -160,11 +160,21 @@
          use_base_dir="false"
          type="BINDATA"
          compress="gzip" />
-  <include name="IDR_CR_ELEMENTS_CR_TOOLTIP_ICON_M_JS"
+  <include name="IDR_CR_ELEMENTS_POLICY_CR_TOOLTIP_ICON_M_JS"
          file="${root_gen_dir}/ui/webui/resources/cr_elements/policy/cr_tooltip_icon.m.js"
          use_base_dir="false"
          type="BINDATA"
          compress="gzip" />
+  <include name="IDR_CR_ELEMENTS_POLICY_CR_POLICY_INDICATOR_M_JS"
+         file="${root_gen_dir}/ui/webui/resources/cr_elements/policy/cr_policy_indicator.m.js"
+         use_base_dir="false"
+         type="BINDATA"
+         compress="gzip" />
+  <include name="IDR_CR_ELEMENTS_POLICY_CR_POLICY_INDICATOR_BEHAVIOR_M_JS"
+         file="${root_gen_dir}/ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.m.js"
+         use_base_dir="false"
+         type="BINDATA"
+         compress="gzip" />
   <include name="IDR_CR_ELEMENTS_CR_VIEW_MANAGER_M_JS"
          file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.m.js"
          use_base_dir="false"