OS Settings: Convert InternetSubpage to Polymer 3.

Bug: 1045266
Test: OSSettingsInternetSubpage*

R=khorimoto@chromium.org

Change-Id: Ic4c1409828456121bd66f80700f23990ced14742
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446191
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813960}

chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn

@@ -201,7 +201,7 @@ js_type_check("closure_compile_module") {
     ":internet_page_browser_proxy.m",
     ":internet_shared_css.m",
 
-    #    ":internet_subpage.m",
+    ":internet_subpage.m",
     ":network_proxy_section.m",
     ":network_summary.m",
     ":network_summary_item.m",
@@ -336,7 +336,25 @@ js_library("internet_shared_css.m") {
 js_library("internet_subpage.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":internet_page_browser_proxy.m",
+    "//chrome/browser/resources/settings/chromeos/localized_link:localized_link.m",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
+    "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_behavior_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_list.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row.m",
+    "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":internet_subpage_module" ]
 }
@@ -467,6 +485,8 @@ polymer_modulizer("internet_subpage") {
   js_file = "internet_subpage.js"
   html_file = "internet_subpage.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("network_proxy_section") {

chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/mojo_interface_provider.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_list.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
@@ -10,19 +11,19 @@
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="internet_page_browser_proxy.html">
-<link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="../../chromeos/os_settings_icons_css.html">
-<link rel="import" href="../../i18n_setup.html">
-<link rel="import" href="../deep_linking_behavior.html">
-<link rel="import" href="../os_route.html">
 <link rel="import" href="../../router.html">
-<link rel="import" href="../route_origin_behavior.html">
 <link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../deep_linking_behavior.html">
+<link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="../metrics_recorder.html">
+<link rel="import" href="../os_route.html">
+<link rel="import" href="../route_origin_behavior.html">
+<link rel="import" href="internet_page_browser_proxy.html">
 
 <dom-module id="settings-internet-subpage">
   <template>

chrome/browser/resources/settings/chromeos/os_settings.gni

@@ -98,6 +98,7 @@ os_settings_auto_imports = settings_auto_imports +
                              "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_browser_proxy.html|AmbientModeBrowserProxy,AmbientModeBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/ambient_mode_page/constants.html|AmbientModeTopicSource,AmbientModeTemperatureUnit,AmbientModeAlbum,AmbientModeSettings,TopicSourceItem",
                              "chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_settings_delegate.html|CellularSetupSettingsDelegate",
+                             "chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.html|InternetPageBrowserProxy,InternetPageBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/deep_linking_behavior.html|DeepLinkingBehavior",
                              "chrome/browser/resources/settings/chromeos/metrics_recorder.html|recordSettingChange",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",

chrome/browser/resources/settings/chromeos/os_settings.js

@@ -11,6 +11,7 @@ import './internet_page/cellular_setup_dialog.m.js';
 import './internet_page/internet_config.m.js';
 import './internet_page/internet_detail_page.m.js';
 import './internet_page/internet_known_networks_page.m.js';
+import './internet_page/internet_subpage.m.js';
 import './internet_page/network_proxy_section.m.js';
 import './internet_page/network_summary.m.js';
 import './internet_page/network_summary_item.m.js';

chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp

@@ -65,6 +65,11 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_SUBPAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.m.js"
            use_base_dir="false"
@@ -673,6 +678,11 @@
            use_base_dir="false"
            compress="false" type="BINDATA"
            preprocess="true" />
+  <include name="IDR_OS_SETTINGS_OS_SETTINGS_ICONS_CSS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_settings_icons_css.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_SETTINGS_OS_ROUTE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_route.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

@@ -293,6 +293,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/internet_config_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/internet_detail_page_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/internet_known_networks_page_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/internet_subpage_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/localized_link_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_feature_item_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_feature_toggle_tests.m.js",

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

@@ -46,6 +46,7 @@ js_modulizer("modulize") {
     "internet_config_test.js",
     "internet_detail_page_tests.js",
     "internet_known_networks_page_tests.js",
+    "internet_subpage_tests.js",
     "localized_link_test.js",
     "multidevice_feature_item_tests.js",
     "multidevice_feature_toggle_tests.js",

chrome/test/data/webui/settings/chromeos/internet_subpage_tests.js

@@ -2,6 +2,18 @@
 // 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/chromeos/os_settings.js';
+
+// #import {FakeNetworkConfig} from 'chrome://test/chromeos/fake_network_config_mojom.m.js';
+// #import {MojoInterfaceProviderImpl} from 'chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js';
+// #import {OncMojo} from 'chrome://resources/cr_components/chromeos/network/onc_mojo.m.js';
+// #import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
+// #import {eventToPromise, flushTasks, waitAfterNextRender} from 'chrome://test/test_util.m.js';
+// clang-format on
+
 suite('InternetSubpage', function() {
   /** @type {?SettingsInternetSubpageElement} */
   let internetSubpage = null;
@@ -98,7 +110,7 @@ suite('InternetSubpage', function() {
       await flushAsync();
 
       const deepLinkElement = internetSubpage.$$('#deviceEnabledButton');
-      assert(!!deepLinkElement);
+      assertTrue(!!deepLinkElement);
       await test_util.waitAfterNextRender(deepLinkElement);
       assertEquals(
           deepLinkElement, getDeepActiveElement(),
@@ -147,7 +159,7 @@ suite('InternetSubpage', function() {
       await flushAsync();
 
       const deepLinkElement = internetSubpage.$$('#deviceEnabledButton');
-      assert(!!deepLinkElement);
+      assertTrue(!!deepLinkElement);
       await test_util.waitAfterNextRender(deepLinkElement);
       assertEquals(
           deepLinkElement, getDeepActiveElement(),
@@ -232,7 +244,7 @@ suite('InternetSubpage', function() {
       await flushAsync();
 
       const deepLinkElement = internetSubpage.$$('#tetherEnabledButton');
-      assert(!!deepLinkElement);
+      assertTrue(!!deepLinkElement);
       await test_util.waitAfterNextRender(deepLinkElement);
       assertEquals(
           deepLinkElement, getDeepActiveElement(),

chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js

@@ -99,6 +99,7 @@ TEST_F('OSSettingsNearbyShareSubPageV3Test', 'All', () => mocha.run());
  ['InternetConfig', 'internet_config_test.m.js'],
  ['InternetDetailPage', 'internet_detail_page_tests.m.js'],
  ['InternetKnownNetworksPage', 'internet_known_networks_page_tests.m.js'],
+ ['InternetSubpage', 'internet_subpage_tests.m.js'],
  ['LocalizedLink', 'localized_link_test.m.js'],
  ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
  ['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'],

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

@@ -432,6 +432,8 @@ js_library("network_ip_config.m") {
 js_library("network_list.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_list.m.js" ]
   deps = [
+    ":network_list_item.m",
+    ":network_list_types.m",
     "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
@@ -442,6 +444,7 @@ js_library("network_list.m") {
 js_library("network_list_item.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_list_item.m.js" ]
   deps = [
+    ":network_list_types.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":network_list_item_module" ]
@@ -552,6 +555,7 @@ js_library("network_select.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_select.m.js" ]
   deps = [
     ":network_list.m",
+    ":network_list_types.m",
     ":network_listener_behavior.m",
     ":onc_mojo.m",
     "//third_party/polymer/v3_0/components-chromium/paper-progress:paper-progress",

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

 <link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="network_list_item.html">
+<link rel="import" href="network_list_types.html">
 <link rel="import" href="../../../cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="../../../cr_elements/shared_style_css.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">

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

@@ -9,6 +9,7 @@
 <link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="cr_policy_network_behavior_mojo.html">
 <link rel="import" href="network_icon.html">
+<link rel="import" href="network_list_types.html">
 <link rel="import" href="onc_mojo.html">
 
 <dom-module id="network-list-item">

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

@@ -8,7 +8,7 @@
  * NetworkListItem.
  */
 
-const NetworkList = {};
+/* #export */ const NetworkList = {};
 
 /**
  * Custom data for implementation specific network list items.
@@ -23,5 +23,3 @@ NetworkList.CustomItemState;
 
 /** @typedef {OncMojo.NetworkStateProperties|NetworkList.CustomItemState} */
 NetworkList.NetworkListItemType;
-
-// #export {NetworkList}

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

@@ -4,6 +4,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 <link rel="import" href="mojo_interface_provider.html">
 <link rel="import" href="network_list.html">
+<link rel="import" href="network_list_types.html">
 <link rel="import" href="network_listener_behavior.html">
 <link rel="import" href="onc_mojo.html">
 

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

@@ -33,6 +33,7 @@ cr_components_chromeos_auto_imports = [
   "ui/webui/resources/cr_components/chromeos/network/onc_mojo.html|OncMojo",
   "ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.html|NetworkConfigElementBehavior",
   "ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior",
+  "ui/webui/resources/cr_components/chromeos/network/network_list_types.html|NetworkList",
   "ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html|MojoInterfaceProviderImpl,MojoInterfaceProvider",
   "ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html|recordLockScreenProgress,LockScreenProgress",
   "ui/webui/resources/cr_components/chromeos/cellular_setup/webview_post_util.html|postDeviceDataToWebview",