cr_components/network: Convert NetworkNameservers to Polymer 3.

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

chrome/test/data/webui/BUILD.gn

@@ -251,6 +251,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_ip_config_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_item_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_nameservers_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_password_input_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_property_list_mojo_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",

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

@@ -35,6 +35,7 @@ GEN('#include "content/public/test/browser_test.h"');
   ['NetworkIpConfig', 'network/network_ip_config_test.js', []],
   ['NetworkList', 'network/network_list_test.js', []],
   ['NetworkListItem', 'network/network_list_item_test.js', []],
+  ['NetworkNameservers', 'network/network_nameservers_test.js', []],
   ['NetworkPasswordInput', 'network/network_password_input_test.js', []],
   ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.js', []],
 ].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test));

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

@@ -16,6 +16,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
  ['NetworkIpConfig', 'network/network_ip_config_test.m.js'],
  ['NetworkList', 'network/network_list_test.m.js'],
  ['NetworkListItem', 'network/network_list_item_test.m.js'],
+ ['NetworkNameservers', 'network/network_nameservers_test.m.js'],
  ['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
  ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.m.js'],
 ].forEach(test => registerTest('NetworkComponents', ...test));

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

@@ -12,6 +12,7 @@ js_modulizer("modulize") {
     "network_ip_config_test.js",
     "network_list_item_test.js",
     "network_list_test.js",
+    "network_nameservers_test.js",
     "network_password_input_test.js",
     "network_property_list_mojo_test.js",
   ]

chrome/test/data/webui/cr_components/chromeos/network/network_nameservers_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_nameservers.m.js';
+
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+suite('NetworkNameserversTest', function() {
+  /** @type {!NetworkNameservers|undefined} */
+  let nameservers;
+
+  setup(function() {
+    nameservers = document.createElement('network-nameservers');
+    document.body.appendChild(nameservers);
+    Polymer.dom.flush();
+  });
+
+  test('Select nameservers', async () => {
+    assertTrue(!!nameservers.$.nameserverType);
+
+    // Default nameserver type is 'automatic'.
+    assertEquals('automatic', nameservers.$.nameserverType.selected);
+    assertTrue(nameservers.$$('cr-radio-button[name=automatic]').checked);
+    assertFalse(nameservers.$$('cr-radio-button[name=google]').checked);
+    assertFalse(nameservers.$$('cr-radio-button[name=custom]').checked);
+
+    nameservers.$.nameserverType.selected = 'google';
+    assertFalse(nameservers.$$('cr-radio-button[name=automatic]').checked);
+    assertTrue(nameservers.$$('cr-radio-button[name=google]').checked);
+    assertFalse(nameservers.$$('cr-radio-button[name=custom]').checked);
+
+    nameservers.$.nameserverType.selected = 'custom';
+    assertFalse(nameservers.$$('cr-radio-button[name=automatic]').checked);
+    assertFalse(nameservers.$$('cr-radio-button[name=google]').checked);
+    assertTrue(nameservers.$$('cr-radio-button[name=custom]').checked);
+  });
+});

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

@@ -269,7 +269,7 @@ js_type_check("closure_compile_module") {
     ":network_list_types.m",
     ":network_listener_behavior.m",
 
-    #  ":network_nameservers.m",
+    ":network_nameservers.m",
     ":network_password_input.m",
     ":network_property_list_mojo.m",
     #  ":network_proxy.m",
@@ -425,7 +425,15 @@ js_library("network_listener_behavior.m") {
 js_library("network_nameservers.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_nameservers.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":cr_policy_network_behavior_mojo.m",
+    ":network_shared_css.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
+    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_nameservers_module" ]
 }
@@ -549,8 +557,8 @@ polymer_modulizer("cr_policy_network_indicator_mojo") {
   html_file = "cr_policy_network_indicator_mojo.html"
   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_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorBehavior,CrPolicyIndicatorType",
+  ]
 }
 
 polymer_modulizer("network_apnlist") {
@@ -627,6 +635,7 @@ polymer_modulizer("network_nameservers") {
   js_file = "network_nameservers.js"
   html_file = "network_nameservers.html"
   html_type = "dom-module"
+  auto_imports = cr_components_chromeos_auto_imports
 }
 
 polymer_modulizer("network_password_input") {

ui/webui/resources/cr_components/cr_components_resources_v3.grdp

@@ -54,6 +54,10 @@
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_list_types.m.js"
            use_base_dir="false"
            type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_NETWORK_NAMESERVERS_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_nameservers.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"