cr_components/network: Convert NetworkApnlist to Polymer 3.

R=khorimoto@chromium.org

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

chrome/test/data/webui/BUILD.gn

@@ -247,6 +247,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/sim_detect_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js",
         "$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",

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

@@ -22,6 +22,7 @@ GEN('#include "content/public/test/browser_test.h"');
   ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.js',
     ['../../cr_elements/cr_policy_strings.js']
   ],
+  ['NetworkApnlist', 'network/network_apnlist_test.js', []],
   ['NetworkConfig', 'network/network_config_test.js',
     [
       '//ui/webui/resources/js/assert.js',

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

@@ -12,6 +12,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
 // clang-format off
 [['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.m.js'],
  ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
+ ['NetworkApnlist', 'network/network_apnlist_test.m.js'],
  ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
  ['NetworkIpConfig', 'network/network_ip_config_test.m.js'],
  ['NetworkList', 'network/network_list_test.m.js'],

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

@@ -8,6 +8,7 @@ js_modulizer("modulize") {
   input_files = [
     "cr_policy_network_behavior_mojo_tests.js",
     "cr_policy_network_indicator_mojo_tests.js",
+    "network_apnlist_test.js",
     "network_config_element_behavior_test.js",
     "network_ip_config_test.js",
     "network_list_item_test.js",

chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_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_apnlist.m.js';
+
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+suite('NetworkNetworkApnlistTest', function() {
+  /** @type {!NetworkApnlist|undefined} */
+  let apnlist;
+
+  setup(function() {
+    apnlist = document.createElement('network-apnlist');
+    apnlist.managedProperties = {
+      typeProperties: {
+        cellular: {
+          apnList: {
+            activeValue: [
+              {
+                accessPointName: 'Access Point',
+                name: 'AP-name',
+              },
+            ],
+          },
+          lastGoodApn: {
+            accessPointName: 'Access Point',
+            name: 'AP-name',
+          },
+        },
+      },
+    };
+    document.body.appendChild(apnlist);
+    Polymer.dom.flush();
+  });
+
+  test('Last good APN option', function() {
+    assertTrue(!!apnlist);
+
+    const selectEl = apnlist.$.selectApn;
+    assertTrue(!!selectEl);
+    assertEquals(2, selectEl.length);
+    assertEquals(0, selectEl.selectedIndex);
+    assertEquals('AP-name', selectEl.options.item(0).value);
+    assertEquals('Other', selectEl.options.item(1).value);
+  });
+});

chrome/test/data/webui/cr_components/chromeos/network/network_list_test.js

@@ -35,7 +35,7 @@ suite('NetworkNetworkListTest', function() {
     Polymer.dom.flush();
   });
 
-  test('focus() focuses the first item', async () => {
+  test('focus() focuses the first item', function() {
     const testNetworks = [
       OncMojo.getDefaultNetworkState(mojom.NetworkType.kEthernet, 'eth0'),
       OncMojo.getDefaultNetworkState(mojom.NetworkType.kWiFi, 'wifi'),

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

@@ -254,7 +254,7 @@ js_type_check("closure_compile_module") {
     ":cr_policy_network_indicator_mojo.m",
     ":mojo_interface_provider.m",
 
-    #  ":network_apnlist.m",
+    ":network_apnlist.m",
     #  ":network_choose_mobile.m",
     #  ":network_config.m",
     ":network_config_element_behavior.m",
@@ -315,7 +315,12 @@ js_library("cr_policy_network_indicator_mojo.m") {
 js_library("network_apnlist.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_apnlist.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":network_property_list_mojo.m",
+    ":network_shared_css.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_apnlist_module" ]
 }
@@ -565,6 +570,7 @@ polymer_modulizer("network_apnlist") {
   js_file = "network_apnlist.js"
   html_file = "network_apnlist.html"
   html_type = "dom-module"
+  auto_imports = cr_components_chromeos_auto_imports
 }
 
 polymer_modulizer("network_choose_mobile") {

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

 <link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
-<link rel="import" href="../../../html/i18n_behavior.html">
-<link rel="import" href="../../../cr_elements/md_select_css.html">
+<link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
+<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="network_property_list_mojo.html">
 <link rel="import" href="network_shared_css.html">
 

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

@@ -6,8 +6,6 @@
  * @fileoverview Polymer element for displaying and modifying a list of cellular
  * access points.
  */
-(function() {
-'use strict';
 
 const kDefaultAccessPointName = 'NONE';
 const kOtherAccessPointName = 'Other';
@@ -319,4 +317,3 @@ Polymer({
     return item.accessPointName === this.selectedApn_;
   }
 });
-})();

ui/webui/resources/cr_components/cr_components_resources_v3.grdp

@@ -48,6 +48,10 @@
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/cr_policy_network_indicator_mojo.m.js"
            use_base_dir="false"
            type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_NETWORK_APNLIST_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_apnlist.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
     <include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_ELEMENT_BEHAVIOR_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.m.js"
            use_base_dir="false"