cr_components/network: Convert NetworkChooseMobile to Polymer 3.

R=khorimoto@chromium.org

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

chrome/test/data/webui/BUILD.gn

@@ -256,6 +256,7 @@ if (include_js_tests) {
         "$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_choose_mobile_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_config_input_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_select_test.m.js",

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

@@ -23,6 +23,7 @@ GEN('#include "content/public/test/browser_test.h"');
     ['../../cr_elements/cr_policy_strings.js']
   ],
   ['NetworkApnlist', 'network/network_apnlist_test.js', []],
+  ['NetworkChooseMobile', 'network/network_choose_mobile_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

@@ -13,6 +13,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
 [['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'],
+ ['NetworkChooseMobile', 'network/network_choose_mobile_test.m.js'],
  ['NetworkConfig', 'network/network_config_test.m.js'],
  ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
  ['NetworkConfigInput', 'network/network_config_input_test.m.js'],

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

@@ -9,6 +9,7 @@ js_modulizer("modulize") {
     "cr_policy_network_behavior_mojo_tests.js",
     "cr_policy_network_indicator_mojo_tests.js",
     "network_apnlist_test.js",
+    "network_choose_mobile_test.js",
     "network_config_element_behavior_test.js",
     "network_config_input_test.js",
     "network_config_select_test.js",

chrome/test/data/webui/cr_components/chromeos/network/network_choose_mobile_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_choose_mobile.m.js';
+
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+suite('NetworkChooseMobileTest', function() {
+  /** @type {!NetworkChooseMobile|undefined} */
+  let chooseMobile;
+
+  let mojom;
+
+  setup(function() {
+    mojom = chromeos.networkConfig.mojom;
+
+    chooseMobile = document.createElement('network-choose-mobile');
+    chooseMobile.managedProperties = {
+      typeProperties: {
+        cellular: {}
+      }
+    };
+    document.body.appendChild(chooseMobile);
+    Polymer.dom.flush();
+  });
+
+  test('Scan button enabled state', function() {
+    const scanButton = chooseMobile.$$('cr-button');
+    assertTrue(!!scanButton);
+    assertTrue(scanButton.disabled);
+
+    // A scan requires the connection state to be disconnected and the current
+    // scan state to be 'not scanning'.
+    chooseMobile.managedProperties = {
+      connectionState: mojom.ConnectionStateType.kNotConnected,
+      typeProperties: {
+        cellular: {}
+      }
+    };
+    chooseMobile.deviceState = {
+      scanning: false
+    };
+    Polymer.dom.flush();
+
+    // Scan button is enabled.
+    let isScanEnabled = !scanButton.disabled;
+    assertTrue(isScanEnabled);
+
+    // Set the device state to scanning.
+    chooseMobile.deviceState = {
+      scanning: true
+    };
+    Polymer.dom.flush();
+
+    // Scan button is disabled while the device is currently scanning.
+    assertTrue(scanButton.disabled);
+
+    // Reset scanning status.
+    chooseMobile.deviceState = {
+      scanning: false
+    };
+
+    // Every connection state but kNotConnected prevents scanning.
+    for (const state in mojom.ConnectionStateType) {
+      if (state === mojom.ConnectionStateType.kNotConnected) continue;
+
+      chooseMobile.managedProperties = {
+        connectionState: state,
+        typeProperties: {
+          cellular: {}
+        }
+      };
+      Polymer.dom.flush();
+
+      assertTrue(scanButton.disabled);
+    }
+  });
+});

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

@@ -255,7 +255,7 @@ js_type_check("closure_compile_module") {
     ":mojo_interface_provider.m",
 
     ":network_apnlist.m",
-    #  ":network_choose_mobile.m",
+    ":network_choose_mobile.m",
     ":network_config.m",
     ":network_config_element_behavior.m",
     ":network_config_input.m",
@@ -328,7 +328,12 @@ js_library("network_apnlist.m") {
 js_library("network_choose_mobile.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":network_shared_css.m",
+    "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
+    "//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_button:cr_button.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_choose_mobile_module" ]
 }
@@ -609,6 +614,14 @@ polymer_modulizer("network_choose_mobile") {
   js_file = "network_choose_mobile.js"
   html_file = "network_choose_mobile.html"
   html_type = "dom-module"
+  auto_imports = cr_components_chromeos_auto_imports
+  namespace_rewrites = cr_components_chromeos_namespace_rewrites + [
+    "cros_network_config.mojom.m.js|cros_network_config.mojom-lite.js",
+    "ip_address.mojom.m.js|ip_address.mojom-lite.js",
+    "mojo_bindings_lite.m.js|mojo_bindings_lite.js",
+    "network_types.mojom.m.js|network_types.mojom-lite.js",
+    "time.mojom.m.js|time.mojom-lite.js",
+  ]
 }
 
 polymer_modulizer("network_config") {

ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.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="../../../cr_elements/shared_style_css.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="chrome://resources/cr_elements/shared_style_css.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
+<link rel="import" href="chrome://resources/mojo/services/network/public/mojom/ip_address.mojom.html">
+<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom.html">
+<link rel="import" href="chrome://resources/mojo/mojo/public/mojom/base/time.mojom.html">
+<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel="import" href="mojo_interface_provider.html">
 <link rel="import" href="network_shared_css.html">
 
 <dom-module id="network-choose-mobile">

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

@@ -6,8 +6,6 @@
  * @fileoverview Polymer element for displaying and modifying a list of cellular
  * mobile networks.
  */
-(function() {
-'use strict';
 
 Polymer({
   is: 'network-choose-mobile',
@@ -192,4 +190,3 @@ Polymer({
     this.fire('user-action-setting-change');
   },
 });
-})();

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

@@ -15,6 +15,7 @@ cr_components_chromeos_namespace_rewrites = [
   "cellularSetup.getTimeoutMsForPSimUIState|getTimeoutMsForPSimUIState",
   "cellular_setup.MojoInterfaceProvider|MojoInterfaceProvider",
   "network_config.MojoInterfaceProvider|MojoInterfaceProvider",
+  "network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl",
   "settings.LockScreenProgress|LockScreenProgress",
   "settings.receivedEventFromKeyboard|receivedEventFromKeyboard",
   "webviewPost.util.postDeviceDataToWebview|postDeviceDataToWebview",

ui/webui/resources/cr_components/cr_components_resources_v3.grdp

@@ -52,6 +52,10 @@
            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_CHOOSE_MOBILE_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.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"