cr_components/network: Convert NetworkPasswordInput to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: CrComponentsNetworkPasswordInputTest*
Change-Id: I7201a50e233aba39bd8b086d54c03a3dbb4ca41b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2357709
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798467}

chrome/test/data/webui/BUILD.gn

@@ -189,9 +189,6 @@ if (include_js_tests) {
       "//skia",
     ]
     data = [
-      "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_behavior_mojo_tests.m.js",
-      "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_indicator_mojo_tests.m.js",
-      "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network_config_element_behavior_test.m.js",
       "$root_gen_dir/chrome/test/data/webui/cr_components/managed_footnote_test.m.js",
       "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_button_tests.m.js",
       "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.m.js",
@@ -245,6 +242,10 @@ if (include_js_tests) {
     if (is_chromeos) {
       data += [
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/base_page_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_behavior_mojo_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_indicator_mojo_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network_config_element_behavior_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network_password_input_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/ambient_mode_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",

chrome/test/data/webui/cr_components/chromeos/BUILD.gn

@@ -10,5 +10,6 @@ js_modulizer("modulize") {
     "cr_policy_network_behavior_mojo_tests.js",
     "cr_policy_network_indicator_mojo_tests.js",
     "network_config_element_behavior_test.js",
+    "network_password_input_test.js",
   ]
 }

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_browsertest.js

@@ -41,6 +41,9 @@ GEN('#endif');
   ['NetworkConfigElementBehavior', 'network_config_element_behavior_test.js',
     []
   ],
+  ['NetworkPasswordInput', 'network_password_input_test.js',
+    []
+  ],
 ].forEach(test => registerTest('Network', 'internet-config-dialog', ...test));
 
 [

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_v3_browsertest.js

@@ -7,12 +7,14 @@
 // Polymer BrowserTest fixture.
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 GEN('#include "content/public/test/browser_test.h"');
+GEN('#include "chromeos/constants/chromeos_features.h"');
 
 // clang-format off
 [['BasePage', 'base_page_test.m.js'],
  ['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.m.js'],
  ['CrPolicyNetworkIndicatorMojo', 'cr_policy_network_indicator_mojo_tests.m.js'],
  ['NetworkConfigElementBehavior', 'network_config_element_behavior_test.m.js'],
+ ['NetworkPasswordInput', 'network_password_input_test.m.js'],
 ].forEach(test => registerTest('Network', ...test));
 // clang-format on
 
@@ -21,7 +23,9 @@ function registerTest(componentName, testName, module, caseName) {
   this[className] = class extends PolymerTest {
     /** @override */
     get browsePreload() {
-      return `chrome://test?module=cr_components/chromeos/${module}`;
+      // TODO(jhawkins): Set up test_loader.html for internet-config-dialog
+      // and use it here instead of os-settings.
+      return `chrome://os-settings/test_loader.html?module=cr_components/chromeos/${module}`;
     }
 
     /** @override */
@@ -33,8 +37,12 @@ function registerTest(componentName, testName, module, caseName) {
     }
 
     /** @override */
-    get webuiHost() {
-      return 'dummyurl';
+    get featureList() {
+      return {
+        enabled: [
+          'chromeos::features::kOsSettingsPolymer3',
+        ],
+      };
     }
   };
 

chrome/test/data/webui/cr_components/chromeos/network_password_input_test.js

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// clang-format off
+// #import 'chrome://os-settings/strings.m.js';
+// #import 'chrome://resources/cr_components/chromeos/network/network_password_input.m.js';
+//
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+suite('CrComponentsNetworkPasswordInputTest', function() {
+  /** @type {!NetworkPasswordInput|undefined} */
+  let networkPassword;
+
+  setup(function() {
+    networkPassword = document.createElement('network-password-input');
+    document.body.appendChild(networkPassword);
+    Polymer.dom.flush();
+  });
+
+  test('Show password button', function() {
+    let passwordInput = networkPassword.$$('#input');
+    assertTrue(!!passwordInput);
+    assertFalse(networkPassword.showPassword);
+    assertEquals("password", passwordInput.type);
+
+    let showPassword = networkPassword.$$('#icon');
+    showPassword.click();
+
+    assertTrue(networkPassword.showPassword);
+    assertEquals("text", passwordInput.type);
+  });
+});

ui/webui/resources/cr_components/chromeos/network/BUILD.gn

@@ -267,13 +267,13 @@ js_type_check("closure_compile_module") {
     ":network_listener_behavior.m",
 
     #  ":network_nameservers.m",
-    #  ":network_password_input.m",
+    ":network_password_input.m",
     #  ":network_property_list_mojo.m",
     #  ":network_proxy.m",
     #  ":network_proxy_exclusions.m",
     #  ":network_proxy_input.m",
     #  ":network_select.m",
-    #  ":network_shared_css.m",
+    ":network_shared_css.m",
     #  ":network_siminfo.m",
     ":onc_mojo.m",
   ]
@@ -425,7 +425,14 @@ js_library("network_nameservers.m") {
 js_library("network_password_input.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_password_input.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":cr_policy_network_behavior_mojo.m",
+    ":cr_policy_network_indicator_mojo.m",
+    ":network_config_element_behavior.m",
+    ":network_shared_css.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_password_input_module" ]
 }
@@ -531,7 +538,6 @@ polymer_modulizer("cr_policy_network_indicator_mojo") {
   html_type = "dom-module"
   auto_imports = cr_components_chromeos_auto_imports + [
                    "ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorBehavior,CrPolicyIndicatorType",
-                   "ui/webui/resources/cr_components/chromeos/network/cr_policy_network_behavior_mojo.html|CrPolicyNetworkBehaviorMojo",
                  ]
 }
 
@@ -618,6 +624,9 @@ polymer_modulizer("network_password_input") {
   js_file = "network_password_input.js"
   html_file = "network_password_input.html"
   html_type = "dom-module"
+  auto_imports = cr_components_chromeos_auto_imports + [
+    "ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.html|NetworkConfigElementBehavior",
+  ]
 }
 
 polymer_modulizer("network_property_list_mojo") {

ui/webui/resources/cr_components/chromeos/os_cr_components.gni

@@ -12,6 +12,7 @@ cr_components_chromeos_namespace_rewrites = [
 
 cr_components_chromeos_auto_imports = [
   "ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorType",
+  "ui/webui/resources/cr_components/chromeos/network/cr_policy_network_behavior_mojo.html|CrPolicyNetworkBehaviorMojo",
   "ui/webui/resources/cr_components/chromeos/network/onc_mojo.html|OncMojo",
   "ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior",
   "ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html|MojoInterfaceProviderImpl,MojoInterfaceProvider",

ui/webui/resources/cr_components/cr_components_resources_v3.grdp

@@ -38,6 +38,14 @@
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.m.js"
            use_base_dir="false"
            type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_NETWORK_PASSWORD_INPUT_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_password_input.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_NETWORK_SHARED_CSS_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_shared_css.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
     <include name="IDR_WEBUI_CHROMEOS_ONC_MOJOM_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/onc_mojo.m.js"
            use_base_dir="false"