OS Settings: Convert InternetPage to Polymer 3.

R=khorimoto@chromium.org

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

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

@@ -196,11 +196,9 @@ js_type_check("closure_compile_module") {
     ":internet_config.m",
     ":internet_detail_page.m",
     ":internet_known_networks_page.m",
-
-    #    ":internet_page.m",
+    ":internet_page.m",
     ":internet_page_browser_proxy.m",
     ":internet_shared_css.m",
-
     ":internet_subpage.m",
     ":network_proxy_section.m",
     ":network_summary.m",
@@ -306,7 +304,30 @@ js_library("internet_known_networks_page.m") {
 js_library("internet_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":cellular_setup_dialog.m",
+    ":internet_config.m",
+    ":internet_detail_page.m",
+    ":internet_known_networks_page.m",
+    ":internet_page_browser_proxy.m",
+    ":internet_subpage.m",
+    ":network_summary.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/prefs:prefs.m",
+    "//chrome/browser/resources/settings/settings_page:settings_animated_pages.m",
+    "//chrome/browser/resources/settings/settings_page:settings_subpage.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//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:mojo_interface_provider.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_expand_button:cr_expand_button.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   extra_deps = [ ":internet_page_module" ]
 }
@@ -404,6 +425,7 @@ js_library("network_summary_item.m") {
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
+    "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_summary_item_module" ]
@@ -473,6 +495,8 @@ polymer_modulizer("internet_page") {
   js_file = "internet_page.js"
   html_file = "internet_page.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("internet_shared_css") {

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

@@ -11,15 +11,14 @@
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="../../chromeos/os_settings_icons_css.html">
-<link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../prefs/prefs.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="../../settings_page/settings_animated_pages.html">
 <link rel="import" href="../../settings_page/settings_subpage.html">
 <link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../deep_linking_behavior.html">
 <link rel="import" href="../metrics_recorder.html">
+<link rel="import" href="../os_route.html">
 <link rel="import" href="cellular_setup_dialog.html">
 <link rel="import" href="internet_config.html">
 <link rel="import" href="internet_detail_page.html">

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

@@ -8,6 +8,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.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">
 

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_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';

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_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_page.m.js"
+           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"

chrome/test/data/webui/BUILD.gn

@@ -294,6 +294,7 @@ if (include_js_tests) {
         "$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/internet_page_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_page_tests.js",
     "internet_subpage_tests.js",
     "localized_link_test.js",
     "multidevice_feature_item_tests.js",
@@ -97,5 +98,7 @@ js_modulizer("modulize") {
                          "nearby_share.FakeNearbyShareSettings|FakeNearbyShareSettings",
                          "nearby_share.FakeReceiveManager|FakeReceiveManager",
                          "nearby_share.FakeContactManager|FakeContactManager",
+                         "test_util.isVisible|isVisible",
+                         "test_util.waitAfterNextRender|waitAfterNextRender",
                        ]
 }

chrome/test/data/webui/settings/chromeos/internet_page_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 {isVisible, waitAfterNextRender} from 'chrome://test/test_util.m.js';
+// clang-format on
+
 suite('InternetPage', function() {
   /** @type {?InternetPageElement} */
   let internetPage = null;
@@ -143,7 +155,7 @@ suite('InternetPage', function() {
 
       const deepLinkElement =
           networkSummary_.$$('#WiFi').$$('#deviceEnabledButton');
-      assert(!!deepLinkElement);
+      assertTrue(!!deepLinkElement);
       await test_util.waitAfterNextRender(deepLinkElement);
       assertEquals(
           deepLinkElement, getDeepActiveElement(),
@@ -251,7 +263,7 @@ suite('InternetPage', function() {
 
       const deepLinkElement =
           networkSummary_.$$('#Cellular').$$('#deviceEnabledButton');
-      assert(!!deepLinkElement);
+      assertTrue(!!deepLinkElement);
       await test_util.waitAfterNextRender(deepLinkElement);
       assertEquals(
           deepLinkElement, getDeepActiveElement(),

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

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