cr_component/network: Convert NetworkProxyExclusions to Polymer 3.

R=khorimoto@chromium.org

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

chrome/test/data/webui/BUILD.gn

@@ -268,6 +268,7 @@ if (include_js_tests) {
         "$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_components/chromeos/network/network_proxy_exclusions_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_proxy_input_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_select_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_siminfo_test.m.js",

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

@@ -43,6 +43,7 @@ GEN('#include "content/public/test/browser_test.h"');
   ['NetworkNameservers', 'network/network_nameservers_test.js', []],
   ['NetworkPasswordInput', 'network/network_password_input_test.js', []],
   ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.js', []],
+  ['NetworkProxyExclusions', 'network/network_proxy_exclusions_test.js', []],
   ['NetworkProxyInput', 'network/network_proxy_input_test.js', []],
   ['NetworkSiminfo', 'network/network_siminfo_test.js', []],
 ].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test));

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

@@ -25,6 +25,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
  ['NetworkNameservers', 'network/network_nameservers_test.m.js'],
  ['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
  ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.m.js'],
+ ['NetworkProxyExclusions', 'network/network_proxy_exclusions_test.m.js'],
  ['NetworkProxyInput', 'network/network_proxy_input_test.m.js'],
  ['NetworkSelect', 'network/network_select_test.m.js'],
  ['NetworkSiminfo', 'network/network_siminfo_test.m.js'],

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

@@ -21,6 +21,7 @@ js_modulizer("modulize") {
     "network_nameservers_test.js",
     "network_password_input_test.js",
     "network_property_list_mojo_test.js",
+    "network_proxy_exclusions_test.js",
     "network_proxy_input_test.js",
     "network_select_test.js",
     "network_siminfo_test.js",

chrome/test/data/webui/cr_components/chromeos/network/network_proxy_exclusions_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_proxy_exclusions.m.js';
+//
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+suite('NetworkProxyExclusionsTest', function() {
+  /** @type {!NetworkProxyExclusions|undefined} */
+  let proxyExclusions;
+
+  setup(function() {
+    proxyExclusions = document.createElement('network-proxy-exclusions');
+    document.body.appendChild(proxyExclusions);
+    Polymer.dom.flush();
+  });
+
+  test('Clear fires proxy-exclusions-change event', function(done) {
+    proxyExclusions.exclusions = [
+      'one', 'two', 'three'
+    ];
+    Polymer.dom.flush();
+
+    // Verify that clicking the clear button fires the proxy-exclusions-change
+    // event and that the item was removed from the exclusions list.
+    proxyExclusions.addEventListener('proxy-exclusions-change', function() {
+      assertDeepEquals(proxyExclusions.exclusions, ['two', 'three']);
+      done();
+    });
+
+    const clearBtn = proxyExclusions.$$('cr-icon-button');
+    assertTrue(!!clearBtn);
+
+    // Simulate pressing clear on the first exclusion list item.
+    clearBtn.click();
+  });
+});

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

@@ -273,7 +273,7 @@ js_type_check("closure_compile_module") {
     ":network_password_input.m",
     ":network_property_list_mojo.m",
     #  ":network_proxy.m",
-    #  ":network_proxy_exclusions.m",
+    ":network_proxy_exclusions.m",
     ":network_proxy_input.m",
     ":network_select.m",
     ":network_shared_css.m",
@@ -519,7 +519,11 @@ js_library("network_proxy.m") {
 js_library("network_proxy_exclusions.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":network_shared_css.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
+    "//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/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_proxy_exclusions_module" ]
 }
@@ -732,6 +736,8 @@ polymer_modulizer("network_proxy_exclusions") {
   js_file = "network_proxy_exclusions.js"
   html_file = "network_proxy_exclusions.html"
   html_type = "dom-module"
+  auto_imports = cr_components_chromeos_auto_imports
+  namespace_rewrites = cr_components_chromeos_namespace_rewrites
 }
 
 polymer_modulizer("network_proxy_input") {

ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.html

 <link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="../../../cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="../../../cr_elements/hidden_style_css.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
+<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
 <dom-module id="network-proxy-exclusions">

ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.js

@@ -7,8 +7,6 @@
  * Includes UI for adding, changing, and removing entries.
  */
 
-(function() {
-
 Polymer({
   is: 'network-proxy-exclusions',
 
@@ -45,4 +43,3 @@ Polymer({
     this.fire('proxy-exclusions-change');
   }
 });
-})();

ui/webui/resources/cr_components/cr_components_resources_v3.grdp

@@ -108,6 +108,10 @@
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.m.js"
            use_base_dir="false"
            type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_EXCLUSIONS_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
     <include name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_INPUT_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_proxy_input.m.js"
            use_base_dir="false"