BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-12 14:27:29 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-13 09:35:20 +0000
commit: c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree: e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/webui/resources/cr_components
parent: 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
download: qtwebengine-chromium-85-based.tar.gz
93 files changed, 832 insertions, 674 deletions
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/ca_trust_edit_dialog.js b/chromium/ui/webui/resources/cr_components/certificate_manager/ca_trust_edit_dialog.js
index 32a9d187400..065021583f5 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/ca_trust_edit_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/ca_trust_edit_dialog.js
@@ -8,16 +8,17 @@
  *    imported.
  *  - edit the trust level of an already existing certificate authority.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js';
-import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_checkbox/cr_checkbox.m.js';
+import '../../cr_elements/cr_dialog/cr_dialog.m.js';
 import 'chrome://resources/polymer/v3_0/paper-spinner/paper-spinner-lite.js';
 import './certificate_shared_css.js';
 
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+import {loadTimeData} from '../../js/load_time_data.m.js';
+
 import {CaTrustInfo, CertificatesBrowserProxy, CertificatesBrowserProxyImpl, CertificateSubnode, NewCertificateSubNode} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_delete_confirmation_dialog.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_delete_confirmation_dialog.js
index 05c048f2a41..17b9e424309 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_delete_confirmation_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_delete_confirmation_dialog.js
@@ -6,15 +6,16 @@
  * @fileoverview A confirmation dialog allowing the user to delete various types
  * of certificates.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_dialog/cr_dialog.m.js';
 import './certificate_shared_css.js';
 
-import {assertNotReached} from 'chrome://resources/js/assert.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {assertNotReached} from '../../js/assert.m.js';
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+import {loadTimeData} from '../../js/load_time_data.m.js';
+
 import {CertificatesBrowserProxy, CertificatesBrowserProxyImpl, CertificateSubnode, CertificateType} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_entry.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_entry.js
index 319097ec3a8..6686997c1c6 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_entry.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_entry.js
@@ -5,16 +5,17 @@
 /**
  * @fileoverview An element that represents an SSL certificate entry.
  */
-import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.m.js';
-import 'chrome://resources/cr_elements/policy/cr_policy_indicator.m.js';
+import '../../cr_elements/cr_expand_button/cr_expand_button.m.js';
+import '../../cr_elements/policy/cr_policy_indicator.m.js';
 import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
 import './certificate_shared_css.js';
 import './certificate_subentry.js';
 
-import {CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {CrPolicyIndicatorType} from '../../cr_elements/policy/cr_policy_indicator_behavior.m.js';
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+
 import {CertificatesOrgGroup, CertificateType} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_list.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_list.js
index 305f056eb97..3d68d034da2 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_list.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_list.js
@@ -6,16 +6,17 @@
  * @fileoverview 'certificate-list' is an element that displays a list of
  * certificates.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
 import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
 import './certificate_entry.js';
 import './certificate_shared_css.js';
 
-import {assertNotReached} from 'chrome://resources/js/assert.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {assertNotReached} from '../../js/assert.m.js';
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+import {loadTimeData} from '../../js/load_time_data.m.js';
+
 import {CertificateAction, CertificateActionEvent, CertificateActionEventDetail} from './certificate_manager_types.js';
 import {CertificatesBrowserProxy, CertificatesBrowserProxyImpl, CertificatesOrgGroup, CertificateType, NewCertificateSubNode} from './certificates_browser_proxy.js';
 
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_manager.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_manager.js
index 98ea4179204..74971877997 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_manager.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_manager.js
@@ -5,8 +5,8 @@
 /**
  * @fileoverview The 'certificate-manager' component manages SSL certificates.
  */
-import 'chrome://resources/cr_elements/cr_tabs/cr_tabs.m.js';
-import 'chrome://resources/cr_elements/hidden_style_css.m.js';
+import '../../cr_elements/cr_tabs/cr_tabs.m.js';
+import '../../cr_elements/hidden_style_css.m.js';
 import 'chrome://resources/polymer/v3_0/iron-pages/iron-pages.js';
 import './ca_trust_edit_dialog.js';
 import './certificate_delete_confirmation_dialog.js';
@@ -16,13 +16,14 @@ import './certificate_password_encryption_dialog.js';
 import './certificates_error_dialog.js';
 import './certificate_provisioning_list.js';
 
-import {assert} from 'chrome://resources/js/assert.m.js';
-import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {assert} from '../../js/assert.m.js';
+import {focusWithoutInk} from '../../js/cr/ui/focus_without_ink.m.js';
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+import {loadTimeData} from '../../js/load_time_data.m.js';
+import {WebUIListenerBehavior} from '../../js/web_ui_listener_behavior.m.js';
+
 import {CertificateAction, CertificateActionEvent, CertificatesErrorEventDetail} from './certificate_manager_types.js';
 import {CertificatesBrowserProxyImpl, CertificatesError, CertificatesImportError, CertificatesOrgGroup, CertificateSubnode, CertificateType} from './certificates_browser_proxy.js';
 
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_decryption_dialog.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_decryption_dialog.js
index 208dad02793..1eeb99f487a 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_decryption_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_decryption_dialog.js
@@ -6,14 +6,15 @@
  * @fileoverview A dialog prompting the user for a decryption password such that
  * a previously exported personal certificate can be imported.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
-import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_dialog/cr_dialog.m.js';
+import '../../cr_elements/cr_input/cr_input.m.js';
 import './certificate_shared_css.js';
 
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+
 import {CertificatesBrowserProxy, CertificatesBrowserProxyImpl} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_encryption_dialog.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_encryption_dialog.js
index 8a5765590c6..b414c38bce7 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_encryption_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_password_encryption_dialog.js
@@ -6,15 +6,16 @@
  * @fileoverview A dialog prompting the user to encrypt a personal certificate
  * before it is exported to disk.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
-import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
-import 'chrome://resources/cr_elements/shared_vars_css.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_dialog/cr_dialog.m.js';
+import '../../cr_elements/cr_input/cr_input.m.js';
+import '../../cr_elements/shared_vars_css.m.js';
 import './certificate_shared_css.js';
 
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+
 import {CertificatesBrowserProxy, CertificatesBrowserProxyImpl, CertificateSubnode} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_shared_css.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_shared_css.js
index de8da595448..0d1cd58b314 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_shared_css.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_shared_css.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'chrome://resources/cr_elements/shared_style_css.m.js';
+import '../../cr_elements/shared_style_css.m.js';
 const template = document.createElement('template');
 template.innerHTML = `
 <dom-module id="certificate-shared">{__html_template__}</dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_subentry.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_subentry.js
index 1ba7132e3e4..ef95ba04614 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_subentry.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificate_subentry.js
@@ -6,17 +6,18 @@
  * @fileoverview certificate-subentry represents an SSL certificate sub-entry.
  */
 
-import 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.m.js';
-import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
-import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.m.js';
-import 'chrome://resources/cr_elements/policy/cr_policy_indicator.m.js';
-import 'chrome://resources/cr_elements/icons.m.js';
+import '../../cr_elements/cr_action_menu/cr_action_menu.m.js';
+import '../../cr_elements/cr_icon_button/cr_icon_button.m.js';
+import '../../cr_elements/cr_lazy_render/cr_lazy_render.m.js';
+import '../../cr_elements/policy/cr_policy_indicator.m.js';
+import '../../cr_elements/icons.m.js';
 import './certificate_shared_css.js';
 
-import {CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {CrPolicyIndicatorType} from '../../cr_elements/policy/cr_policy_indicator_behavior.m.js';
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+
 import {CertificateAction, CertificateActionEvent, CertificateActionEventDetail} from './certificate_manager_types.js';
 import {CertificatesBrowserProxy, CertificatesBrowserProxyImpl, CertificateSubnode, CertificateType} from './certificates_browser_proxy.js';
 
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_browser_proxy.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_browser_proxy.js
index d1f146db1b2..11d0f3468d5 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_browser_proxy.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_browser_proxy.js
@@ -8,7 +8,7 @@
  */
 
 // clang-format off
-import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
+import {addSingletonGetter, sendWithPromise} from '../../js/cr.m.js';
 // clang-format on
 
 /**
diff --git a/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_error_dialog.js b/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_error_dialog.js
index 25562355152..6ff0a49554e 100644
--- a/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_error_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/certificate_manager/certificates_error_dialog.js
@@ -6,14 +6,15 @@
  * @fileoverview A dialog for showing SSL certificate related error messages.
  * The user can only close the dialog, there is no other possible interaction.
  */
-import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
+import '../../cr_elements/cr_button/cr_button.m.js';
+import '../../cr_elements/cr_dialog/cr_dialog.m.js';
 import './certificate_shared_css.js';
 
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {I18nBehavior} from '../../js/i18n_behavior.m.js';
+import {loadTimeData} from '../../js/load_time_data.m.js';
+
 import {CertificatesError, CertificatesImportError} from './certificates_browser_proxy.js';
 
 Polymer({
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/BUILD.gn b/chromium/ui/webui/resources/cr_components/chromeos/BUILD.gn
index d96f84805d0..be17a059d14 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/BUILD.gn
+++ b/chromium/ui/webui/resources/cr_components/chromeos/BUILD.gn
@@ -8,10 +8,11 @@ assert(is_chromeos, "Only ChromeOS components belong here.")
 
 group("closure_compile") {
   deps = [
-    ":chromeos_resources",
+    "bluetooth:closure_compile",
     "cellular_setup:closure_compile",
     "multidevice_setup:closure_compile",
     "network:closure_compile",
+    "network_health:closure_compile",
     "quick_unlock:closure_compile",
     "smb_shares:closure_compile",
 
@@ -19,36 +20,17 @@ group("closure_compile") {
     # TODO: Uncomment as Polymer3 migration makes progress.
     # "network:closure_compile_module",
     # "quick_unlock:closure_compile_module",
+    "bluetooth:closure_compile_module",
+    "network_health:closure_compile_module",
     "smb_shares:closure_compile_module",
   ]
 }
 
-js_type_check("chromeos_resources") {
-  deps = [ ":bluetooth_dialog" ]
-}
-
-js_library("bluetooth_dialog") {
-  deps = [
-    "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [
-    "$externs_path/bluetooth.js",
-    "$externs_path/bluetooth_private.js",
-  ]
-  extra_sources = [
-    "$interfaces_path/bluetooth_interface.js",
-    "$interfaces_path/bluetooth_private_interface.js",
-  ]
-}
-
 group("polymer3_elements") {
   public_deps = [
+    "bluetooth:polymer3_elements",
     "network:polymer3_elements",
+    "network_health:polymer3_elements",
     "quick_unlock:polymer3_elements",
     "smb_shares:polymer3_elements",
   ]
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn
new file mode 100644
index 00000000000..16484cc89e9
--- /dev/null
+++ b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn
@@ -0,0 +1,68 @@
+# 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.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+assert(is_chromeos, "Bluetooth dialog is Chrome OS only.")
+
+js_type_check("closure_compile") {
+  deps = [ ":bluetooth_dialog" ]
+}
+
+js_library("bluetooth_dialog") {
+  deps = [
+    "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/bluetooth.js",
+                   "$externs_path/bluetooth_private.js",
+                 ]
+  extra_sources = [
+    "$interfaces_path/bluetooth_interface.js",
+    "$interfaces_path/bluetooth_private_interface.js",
+  ]
+}
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":bluetooth_dialog.m" ]
+}
+
+js_library("bluetooth_dialog.m") {
+  sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.m.js" ]
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/bluetooth.js",
+                   "$externs_path/bluetooth_private.js",
+                 ]
+  extra_sources = [
+    "$interfaces_path/bluetooth_interface.js",
+    "$interfaces_path/bluetooth_private_interface.js",
+  ]
+  extra_deps = [ ":bluetooth_dialog_module" ]
+}
+
+polymer_modulizer("bluetooth_dialog") {
+  js_file = "bluetooth_dialog.js"
+  html_file = "bluetooth_dialog.html"
+  html_type = "dom-module"
+  auto_imports = [ "ui/webui/resources/html/assert.html|assert" ]
+}
+
+group("polymer3_elements") {
+  public_deps = [ ":bluetooth_dialog_module" ]
+}
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.html
index eb16143ad6e..1fa6b160301 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.html
@@ -1,11 +1,12 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
-<link rel="import" href="chrome://resources/html/cr.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/hidden_style_css.html">
+<link rel="import" href="../../../html/cr.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="../../../html/assert.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-list/iron-list.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.js b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.js
index 64e983b7816..64e983b7816 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.js
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.html
index 410c979129d..a8785a97ddb 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.html
@@ -1,6 +1,6 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
 
 <dom-module id="base-page">
   <template>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.html
index 366552c5eaa..06367467b90 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.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/shared_style_css.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
 
 <dom-module id="button-bar">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.html
index 7215cefcb97..31727da02b2 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.html
@@ -1,11 +1,11 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/button_bar.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/sim_detect_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/provisioning_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/final_page.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="mojo_interface_provider.html">
+<link rel="import" href="button_bar.html">
+<link rel="import" href="sim_detect_page.html">
+<link rel="import" href="provisioning_page.html">
+<link rel="import" href="final_page.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.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-pages/iron-pages.html">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/final_page.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/final_page.html
index 63ed4e450d1..0f733f1c174 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/final_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/final_page.html
@@ -1,7 +1,7 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/base_page.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="base_page.html">
 
 <dom-module id="final-page">
   <template>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html
index 115d282b2a6..b7096a0baf6 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="../../../html/cr.html">
 <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
 <link rel="import" href="chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.html">
 <script src="mojo_interface_provider.js"></script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.html
index 43e2dcb035f..2bde376730c 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/base_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/webview_post_util.html">
-<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="base_page.html">
+<link rel="import" href="webview_post_util.html">
+<link rel="import" href="../../../cr_elements/hidden_style_css.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/paper-spinner/paper-spinner-lite.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.html b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.html
index ec6ef312ee4..8efc04545bd 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.html
@@ -1,8 +1,8 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/cellular_setup/base_page.html">
-<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="base_page.html">
+<link rel="import" href="../../../cr_elements/hidden_style_css.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/paper-spinner/paper-spinner-lite.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn
index de6c651e0e0..63fd8b30f9d 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn
@@ -67,7 +67,8 @@ js_library("password_page") {
     "//ui/webui/resources/cr_elements/cr_input:cr_input",
     "//ui/webui/resources/js:cr",
   ]
-  externs_list = [ "$externs_path/quick_unlock_private.js" ]
+  externs_list = chrome_extension_public_externs +
+                 [ "$externs_path/quick_unlock_private.js" ]
   extra_sources = [ "$interfaces_path/quick_unlock_private_interface.js" ]
 }
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html
index ba3ac45f532..b448b290e00 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html
@@ -1,6 +1,6 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
 
 <dom-module id="button-bar">
   <template>
@@ -47,6 +47,6 @@
       </div>
     </div>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/button_bar.js">
+  <script src="button_bar.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html
index 12556f5782b..a2c17b6179d 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="../../../html/cr.html">
 
-<script src="chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.js">
+<script src="fake_mojo_service.js">
 </script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html
index 0232cf476e4..2eee1473ba5 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api.html
index 2f44ddb6b3a..dc3ddbbd31b 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="../../../html/cr.html">
 <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
 <link rel="import" href="chrome://resources/mojo/chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.html">
-<script src="mojo_api.js"></script>
-\ No newline at end of file
+<script src="mojo_api.js"></script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html
index 978dc71e9a5..6e61d099146 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html
@@ -1,15 +1,15 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/button_bar.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/password_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.html">
-<link rel="import" href="chrome://resources/html/cr.html">
-<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="button_bar.html">
+<link rel="import" href="fake_mojo_service.html">
+<link rel="import" href="mojo_api.html">
+<link rel="import" href="multidevice_setup_delegate.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
+<link rel="import" href="password_page.html">
+<link rel="import" href="setup_succeeded_page.html">
+<link rel="import" href="start_setup_page.html">
+<link rel="import" href="../../../html/cr.html">
+<link rel="import" href="../../../html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
 
 <dom-module id="multidevice-setup">
@@ -105,6 +105,6 @@
       </button-bar>
     </div>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.js">
+  <script src="multidevice_setup.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html
index 82f8d961c25..38c23fdedf0 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html
@@ -1,3 +1,3 @@
-<link rel="import" href="chrome://resources/html/cr.html">
-<script src="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.js">
+<link rel="import" href="../../../html/cr.html">
+<script src="multidevice_setup_browser_proxy.js">
 </script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html
index 46ce0b9a518..22e3eb30088 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/cr.html">
-<script src="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js">
+<link rel="import" href="../../../html/cr.html">
+<script src="multidevice_setup_delegate.js">
 </script>
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html
index 3d4bb236c75..3d26c8bddd2 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html
@@ -1,8 +1,8 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.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/cr_elements/md_select_css.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../cr_elements/md_select_css.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-flex-layout/iron-flex-layout.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html
index 454df4da397..1d1b634c8f8 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html
@@ -1,10 +1,10 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
+<link rel="import" href="ui_page.html">
+<link rel="import" href="ui_page_container_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../html/cr.html">
 
 <dom-module id="password-page">
   <template>
@@ -46,6 +46,6 @@
       </div>
     </ui-page>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/password_page.js">
+  <script src="password_page.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html
index c33ae7b1314..fefc1dc6e55 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html
@@ -1,10 +1,10 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html">
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="multidevice_setup_browser_proxy.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
+<link rel="import" href="ui_page.html">
+<link rel="import" href="ui_page_container_behavior.html">
+<link rel="import" href="../../../html/cr.html">
 
 <dom-module id="setup-succeeded-page">
   <template>
@@ -31,6 +31,6 @@
       </div>
     </ui-page>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js">
+  <script src="setup_succeeded_page.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js
index ebc520fb3fb..b01d0553523 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js
@@ -36,10 +36,7 @@ Polymer({
 
   /** @private */
   getMessageHtml_() {
-    const validNodeFn = (node, value) => node.tagName === 'A';
-    return this.i18nAdvanced(
-        'setupSucceededPageMessage',
-        {attrs: {'id': validNodeFn, 'href': validNodeFn}});
+    return this.i18nAdvanced('setupSucceededPageMessage', {attrs: ['id']});
   },
 
   /** @override */
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html
index 2ade2d97506..d5de70f7d2f 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html
@@ -1,11 +1,11 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/icons.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html">
-<link rel="import" href="chrome://resources/html/cr.html">
-<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="../../../html/polymer.html">
+
+<link rel="import" href="icons.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
+<link rel="import" href="ui_page.html">
+<link rel="import" href="ui_page_container_behavior.html">
+<link rel="import" href="../../../html/cr.html">
+<link rel="import" href="../../../html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
 <dom-module id="start-setup-page">
@@ -171,6 +171,6 @@
       </div>
     </ui-page>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.js">
+  <script src="start_setup_page.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html
index 289e08644b8..1bdfe7b6e32 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html
@@ -1,8 +1,8 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/icons.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
+<link rel="import" href="icons.html">
+<link rel="import" href="multidevice_setup_shared_css.html">
 
 <dom-module id="ui-page">
   <template>
@@ -37,6 +37,6 @@
       <slot name="additional-content"></slot>
     </div>
   </template>
-  <script src="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page.js">
+  <script src="ui_page.js">
   </script>
 </dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html
index 501cc374471..3485a99540e 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html
@@ -1,5 +1,5 @@
-<link rel="import" href="chrome://resources/html/cr.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../html/cr.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 
-<script src="chrome://resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.js">
+<script src="ui_page_container_behavior.js">
 </script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/BUILD.gn b/chromium/ui/webui/resources/cr_components/chromeos/network/BUILD.gn
index 6e1c7b28780..ca7f9fc53fc 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/BUILD.gn
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/BUILD.gn
@@ -63,7 +63,8 @@ js_library("network_config") {
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
   ]
-  externs_list = [ "$externs_path/networking_private.js" ]
+  externs_list = chrome_extension_public_externs +
+                 [ "$externs_path/networking_private.js" ]
   extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
 }
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0.svg
index ed3c8cc4b3b..a921d4bec9b 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path fill-opacity=".3" d="M2 18h16V2"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.002 15.002V7.41622L7.41622 15.002H15.002ZM16.002 17.002C16.5543 17.002 17.002 16.5543 17.002 16.002V5.002C17.002 4.1111 15.9249 3.66493 15.2949 4.2949L4.2949 15.2949C3.66493 15.9249 4.1111 17.002 5.002 17.002H16.002Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0_with_x.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0_with_x.svg
index 6065be32a92..39e42cfbccb 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0_with_x.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_0_with_x.svg
@@ -1,6 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <g fill="none" transform="translate(2 2)">
-    <polygon fill="#000" fill-opacity=".3" points="0 17 17 17 17 0"/>
-    <polygon fill="#B2B2B2" points="5.917 .671 5.329 .083 3 2.413 .671 .083 .083 .671 2.413 3 .083 5.329 .671 5.917 3 3.587 5.329 5.917 5.917 5.329 3.587 3"/>
-  </g>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.002 15.002V7.41622L7.41622 15.002H15.002ZM16.002 17.002C16.5543 17.002 17.002 16.5543 17.002 16.002V5.002C17.002 4.1111 15.9249 3.66493 15.2949 4.2949L4.2949 15.2949C3.66493 15.9249 4.1111 17.002 5.002 17.002H16.002Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.66667 6L8 4.66667L7.33333 4L6 5.33333L4.66667 4L4 4.66667L5.33333 6L4 7.33333L4.66667 8L6 6.66667L7.33333 8L8 7.33333L6.66667 6Z"/>
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_1.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_1.svg
index d3cd34e9263..66d98d2f9aa 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_1.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path fill-opacity=".3" d="M2.094 18H18V1.984"/>
-  <path d="M8 12l-6 6h6"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.002 15.002V7.41622L7.41622 15.002H15.002ZM16.002 17.002C16.5543 17.002 17.002 16.5543 17.002 16.002V5.002C17.002 4.1111 15.9249 3.66493 15.2949 4.2949L4.2949 15.2949C3.66493 15.9249 4.1111 17.002 5.002 17.002H16.002Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.002 16.002C9.002 16.5543 8.55429 17.002 8.002 17.002H5.002C4.1111 17.002 3.66493 15.9249 4.2949 15.2949L7.2949 12.2949C7.92486 11.6649 9.002 12.1111 9.002 13.002V16.002Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_2.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_2.svg
index 956dbc3ede1..9066c2192a4 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_2.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path fill-opacity=".3" d="M2 18h16V2"/>
-  <path d="M11.003 9L1 18h10.003"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.002 15.002V7.41622L7.41622 15.002H15.002ZM16.002 17.002C16.5543 17.002 17.002 16.5543 17.002 16.002V5.002C17.002 4.1111 15.9249 3.66493 15.2949 4.2949L4.2949 15.2949C3.66493 15.9249 4.1111 17.002 5.002 17.002H16.002Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.002 16.002C12.002 16.5543 11.5543 17.002 11.002 17.002H5.002C4.1111 17.002 3.66493 15.9249 4.2949 15.2949L10.2949 9.2949C10.9249 8.66493 12.002 9.1111 12.002 10.002V16.002Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_3.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_3.svg
index aa11564d454..a3cd603aa44 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_3.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path fill-opacity=".3" d="M2 18h16.02V2"/>
-  <path d="M14 6L2 18h12"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.002 15.002V7.41622L7.41622 15.002H15.002ZM16.002 17.002C16.5543 17.002 17.002 16.5543 17.002 16.002V5.002C17.002 4.1111 15.9249 3.66493 15.2949 4.2949L4.2949 15.2949C3.66493 15.9249 4.1111 17.002 5.002 17.002H16.002Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 16.002C13.5 16.5543 13.0523 17.002 12.5 17.002H5.002C4.1111 17.002 3.66493 15.9249 4.2949 15.2949L11.7929 7.79289C12.4229 7.16293 13.5 7.6091 13.5 8.5V16.002Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_4.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_4.svg
index 8e438886fba..2be87e0464c 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_4.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_4.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M2 18h16V2"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.002 16.002C17.002 16.5543 16.5543 17.002 16.002 17.002H5.002C4.1111 17.002 3.66493 15.9249 4.2949 15.2949L15.2949 4.2949C15.9249 3.66493 17.002 4.1111 17.002 5.002V16.002Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_off.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_off.svg
index 7bf72adefcf..4d72a7c3c54 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_off.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/cellular_off.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M18,1 L10.78,8.02818182 L18,15.0563636 L18,1 Z M4.23142857,3.86363636 L3.14285714,4.90272727 L8.59428571,10.1063636 L0.999023438,17.0039062 L16,17.0039062 L17.9114286,19 L19,17.9609091 L4.23142857,3.86363636 Z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 16C17 16.5523 16.5523 17 16 17H4.99999C4.10909 17 3.66292 15.9228 4.29288 15.2929L15.2929 4.29288C15.9228 3.66292 17 4.10909 17 4.99999V16ZM15 15V7.41418L7.41418 15H15Z"/>
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/ethernet.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/ethernet.svg
index c7cfb72c2de..6c0c5f9ab0b 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/ethernet.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/ethernet.svg
@@ -1,3 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M6.015 6L2 10.5 6.015 15 7 14.227 3.663 10.5 7 6.773 6.015 6zM7 11h1v-1H7v1zm5-1h-1v1h1v-1zm-3 1h1v-1H9v1zm3-4.227l3.337 3.727L12 14.227l.985.773L17 10.5 12.985 6 12 6.773z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<g id="ethernet">
+<path id="Shape 1" fill-rule="evenodd" clip-rule="evenodd" d="M14.0909 5L12.9373 6.175L16.6845 10L12.9373 13.825L14.0909 15L19 10L14.0909 5ZM7.06273 6.175L5.90909 5L1 10L5.90909 15L7.06273 13.825L3.31545 10L7.06273 6.175ZM7.05457 11C7.59682 11 8.03639 10.5523 8.03639 10C8.03639 9.44772 7.59682 9 7.05457 9C6.51233 9 6.07275 9.44772 6.07275 10C6.07275 10.5523 6.51233 11 7.05457 11ZM10 11C10.5422 11 10.9818 10.5523 10.9818 10C10.9818 9.44772 10.5422 9 10 9C9.45776 9 9.01819 9.44772 9.01819 10C9.01819 10.5523 9.45776 11 10 11ZM12.9454 11C13.4877 11 13.9273 10.5523 13.9273 10C13.9273 9.44772 13.4877 9 12.9454 9C12.4032 9 11.9636 9.44772 11.9636 10C11.9636 10.5523 12.4032 11 12.9454 11Z" />
+</g>
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html b/chromium/ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html
index 91b5cb8df3e..7eaa61575ef 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="../../../html/cr.html">
 <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
 <link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html">
 <script src="mojo_interface_provider.js"></script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_apnlist.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_apnlist.html
index 7c92d24747a..e12cc9d632c 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_apnlist.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_apnlist.html
@@ -1,8 +1,8 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/md_select_css.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="network_property_list_mojo.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.html
index e2c96a75082..511fbabd0b5 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_choose_mobile.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.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="../../../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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config.html
index 9e80c52db89..a01762f6acb 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config.html
@@ -1,13 +1,13 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.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_listener_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/action_link_css.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<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.html">
-<link rel="import" href="chrome://resources/html/action_link.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="mojo_interface_provider.html">
+<link rel="import" href="network_listener_behavior.html">
+<link rel="import" href="../../../cr_elements/action_link_css.html">
+<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_indicator.html">
+<link rel="import" href="../../../html/action_link.html">
+<link rel="import" href="../../../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="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
@@ -185,16 +185,11 @@
       <!-- Share (WiFi) -->
       <template is="dom-if" if="[[shareIsVisible_(managedProperties_)]]"
           restamp>
-        <div class="property-box">
-          <div id="shareLabel" class="start">
-            [[i18n('networkConfigShare')]]
-          </div>
-          <cr-toggle id="share" checked="{{shareNetwork_}}"
-              disabled="[[!shareIsEnabled_(configProperties_.*,
-                        eapProperties_.*, shareAllowEnable)]]"
-              aria-labeledby="shareLabel" on-change="onShareChanged_">
-          </cr-toggle>
-        </div>
+        <network-config-toggle id="share" label="[[i18n('networkConfigShare')]]"
+            checked="{{shareNetwork_}}" on-change="onShareChanged_"
+            disabled="[[!shareIsEnabled_(configProperties_.*,
+                      eapProperties_.*, shareAllowEnable)]]">
+        </network-config-toggle>
       </template>
 
       <!-- AutoConnect (WiFi) -->
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.js b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.js
index bda8a2be931..c341b01eba1 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.js
@@ -29,7 +29,7 @@ const NetworkConfigElementBehavior = {
    * @param {boolean} disabled
    * @param {?OncMojo.ManagedProperty} property
    * @return {boolean} True if the element should be disabled.
-   * @private
+   * @protected
    */
   getDisabled_(disabled, property) {
     return disabled || (!!property && this.isNetworkPolicyEnforced(property));
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_input.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_input.html
index fa2acddae31..9e57d8efd1b 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_input.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_input.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_indicator_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
 <link rel="import" href="network_config_element_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_select.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_select.html
index 582f7535921..8220cc12d82 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_select.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_select.html
@@ -1,11 +1,11 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_tooltip_icon.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
-<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_indicator_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_tooltip_icon.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/md_select_css.html">
 <link rel="import" href="network_config_element_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.html
index c6ba0583b30..1036dedc58f 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_indicator_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
 <link rel="import" href="network_config_element_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
@@ -13,9 +13,12 @@
       cr-policy-network-indicator-mojo {
         --cr-tooltip-icon-margin-start: var(--cr-controlled-by-spacing);
       }
+      div.property-box {
+        width: 100%;
+      }
     </style>
 
-    <div class="property-box">
+    <div class="property-box" actionable>
       <div class="start">
         [[label]]
       </div>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.js b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.js
index fe499a4889e..fe2e459cf37 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.js
@@ -23,4 +23,23 @@ Polymer({
       notify: true,
     },
   },
+
+  listeners: {
+    'click': 'onHostTap_',
+  },
+
+  /**
+   * Handles non cr-toggle button clicks (cr-toggle handles its own click events
+   * which don't bubble).
+   * @param {!Event} e
+   * @private
+   */
+  onHostTap_(e) {
+    e.stopPropagation();
+    if (this.getDisabled_(this.disabled, this.property)) {
+      return;
+    }
+    this.checked = !this.checked;
+    this.fire('change');
+  },
 });
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_icon.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_icon.html
index 7a59d961faf..ca1475871b4 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_icon.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_icon.html
@@ -1,9 +1,9 @@
 <link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="../../chromeos/network/network_icons.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.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="onc_mojo.html">
+<link rel="import" href="../../../cr_elements/hidden_style_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
 <dom-module id="network-icon">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_icons.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_icons.html
index df5f47ce156..8c611738430 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_icons.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_icons.html
@@ -8,16 +8,16 @@
   <svg>
     <defs>
       <!-- Badges -->
-      <g id="badge-1x"><path d="M0 1h1V0h1v5H1V2H0M3 2h1v1H3V2zm1 1h1v1H4V3zM3 4h1v1H3V4zm2 0h1v1H5V4zm0-2h1v1H5V2z"></path></g>
-      <g id="badge-3g"><path d="M9 0H5v5h4V2H7v1h1v1H6V1h3M3 3v2h1V0H0v1h3v1H1v1h2zM0 4h3v1H0V4z"></path></g>
-      <g id="badge-4g"><path d="M3 4v1h1V0H3v3H0v1h3zM0 2h1v1H0V2zm1-1h1v1H1V1zm1-1h1v1H2V0zM9 0H5v5h4V2H7v1h1v1H6V1h3"></path></g>
-      <g id="badge-edge"><path d="M0 0v5h3V4H1V3h1V2H1V1h2V0"></path></g>
-      <g id="badge-evdo"><path d="M0 0v5h3V4H1V3h1V2H1V1h2V0M4 0h1v2H4V0zm1 2h1v2H5V2zm2 0h1v2H7V2zm1-2h1v2H8V0zM6 4h1v1H6V4z"></path></g>
-      <g id="badge-gsm"><path d="M4 0H0v5h4V2H2v1h1v1H1V1h3"></path></g>
-      <g id="badge-hspa"><path d="M0 0h1v2h2V0h1v5H3V3H1v2H0"></path></g>
-      <g id="badge-hspa-plus"><path d="M0 0h1v2h2V0h1v5H3V3H1v2H0M7 1V0H6v1H5v1h1v1h1V2h1V1H7z"></path></g>
-      <g id="badge-lte"><path d="M0 0v5h3V4H1V0M3 0h5v1H6v4H5V1H3M9 0v5h3V4h-2V3h1V2h-1V1h2V0"></path></g>
-      <g id="badge-lte-advanced"><path d="M0 0v5h3V4H1V0M3 0h5v1H6v4H5V1H3M9 0v5h3V4h-2V3h1V2h-1V1h2V0M15 1V0h-1v1h-1v1h1v1h1V2h1V1h-1z"></path></g>
+      <g id="badge-1x"><path d="M3.46612 7H4.45996V1H4.33265L2 1.85832V2.70021L3.46612 2.19918V7ZM9.04312 2.55647L8.19713 4.01848L7.36756 2.55647H6.26694L7.62218 4.74538L6.21766 7H7.32649L8.20945 5.48049L9.09651 7H10.1971L8.79261 4.74538L10.152 2.55647H9.04312Z" fill="#5F6368"></path></g>
+      <g id="badge-3g"><path d="M3.34091 3.55481H2.74733V4.32487H3.32086C3.67915 4.32487 3.9492 4.40775 4.13102 4.57353C4.31284 4.73931 4.40374 4.97593 4.40374 5.28342C4.40374 5.58824 4.31685 5.82085 4.14305 5.98128C3.96925 6.14171 3.73128 6.22193 3.42914 6.22193C3.1377 6.22193 2.90575 6.14171 2.73329 5.98128C2.56083 5.82085 2.4746 5.6123 2.4746 5.35561H1.5C1.5 5.85294 1.67914 6.25134 2.03743 6.5508C2.39572 6.85027 2.85561 7 3.41711 7C4.00268 7 4.47527 6.84492 4.83489 6.53476C5.19452 6.2246 5.37433 5.80749 5.37433 5.28342C5.37433 4.95722 5.29078 4.67647 5.12366 4.44118C4.95655 4.20588 4.71257 4.03342 4.39171 3.9238C4.65642 3.80615 4.87233 3.63169 5.03944 3.4004C5.20655 3.16912 5.29011 2.92246 5.29011 2.66043C5.29011 2.13903 5.12366 1.73195 4.79078 1.43917C4.45789 1.14639 4 1 3.41711 1C3.06417 1 2.74532 1.06885 2.46056 1.20655C2.1758 1.34425 1.95388 1.5361 1.79479 1.78209C1.63569 2.02808 1.55615 2.3008 1.55615 2.60027H2.53075C2.53075 2.35695 2.61497 2.15976 2.78342 2.00869C2.95187 1.85762 3.16711 1.78209 3.42914 1.78209C3.72861 1.78209 3.9512 1.85896 4.09692 2.0127C4.24265 2.16644 4.31551 2.38235 4.31551 2.66043C4.31551 2.9492 4.22794 3.16979 4.05281 3.32219C3.87767 3.4746 3.64038 3.55214 3.34091 3.55481ZM10.0428 6.78743C10.4171 6.64572 10.7099 6.43717 10.9211 6.16176V3.9238H8.70722V4.69385H9.91043V5.8369C9.69117 6.07219 9.32219 6.18984 8.80348 6.18984C8.33021 6.18984 7.96056 6.01538 7.69452 5.66644C7.42847 5.31751 7.29545 4.82754 7.29545 4.19652V3.74733C7.30348 3.11363 7.4258 2.63302 7.66243 2.30548C7.89907 1.97794 8.24465 1.81417 8.6992 1.81417C9.40241 1.81417 9.81016 2.16577 9.92246 2.86898H10.9171C10.8396 2.2647 10.6096 1.80214 10.2273 1.48128C9.84492 1.16043 9.32888 1 8.67914 1C7.92246 1 7.33289 1.24799 6.91043 1.74398C6.48797 2.23998 6.27674 2.92914 6.27674 3.8115V4.26872C6.28476 4.81952 6.39104 5.30147 6.59559 5.71457C6.80013 6.12768 7.09091 6.44519 7.46791 6.66711C7.84492 6.88904 8.27807 7 8.76738 7C9.24332 7 9.66845 6.92914 10.0428 6.78743Z"></path></g>
+      <g id="badge-4g"><path d="M8.78743 1C8.03074 1 7.44118 1.24799 7.01872 1.74398C6.59625 2.23998 6.38503 2.92914 6.38503 3.8115V4.26872C6.39305 4.81952 6.49933 5.30147 6.70388 5.71457C6.90842 6.12768 7.1992 6.44519 7.5762 6.66711C7.95321 6.88904 8.38636 7 8.87567 7C9.35161 7 9.77674 6.92915 10.1511 6.78743C10.5254 6.64572 10.8182 6.43717 11.0294 6.16176V3.9238H8.81551V4.69385H10.0187V5.8369C9.79946 6.07219 9.43048 6.18984 8.91176 6.18984C8.4385 6.18984 8.06885 6.01538 7.80281 5.66644C7.53676 5.31751 7.40374 4.82754 7.40374 4.19652V3.74733C7.41176 3.11363 7.53409 2.63302 7.77072 2.30548C8.00735 1.97794 8.35294 1.81417 8.80749 1.81417C9.5107 1.81417 9.91845 2.16577 10.0307 2.86898H11.0254C10.9479 2.2647 10.7179 1.80214 10.3356 1.48128C9.95321 1.16043 9.43717 1 8.78743 1ZM5.0254 1.08021H4.01872L1.5 5.02674L1.52807 5.62032H4.0508V6.91979H5.0254V5.62032H5.75134V4.83824H5.0254V1.08021ZM4.0508 2.39973V4.83824H2.52273L3.97861 2.52807L4.0508 2.39973Z"></path></g>
+      <g id="badge-edge"><path d="M3.04258 4.32143H5.50687V3.49725H3.04258V1.84066H5.89423V1H2V7H5.92308V6.16758H3.04258V4.32143Z"></path></g>
+      <g id="badge-evdo"><path d="M2.54258 4.32143H5.00687V3.49725H2.54258V1.84066H5.39423V1H1.5V7H5.42308V6.16758H2.54258V4.32143ZM9.91071 1L8.38599 5.69368L6.87775 1H5.73626L7.88736 7H8.89698L11.0563 1H9.91071Z"></path></g>
+      <g id="badge-gsm"><path d="M5.54012 6.78743C5.91445 6.64572 6.20723 6.43717 6.41846 6.16176V3.9238H4.20456V4.69385H5.40777V5.8369C5.18852 6.07219 4.81954 6.18984 4.30082 6.18984C3.82755 6.18984 3.4579 6.01538 3.19186 5.66644C2.92582 5.31751 2.79279 4.82754 2.79279 4.19652V3.74733C2.80082 3.11363 2.92314 2.63302 3.15977 2.30548C3.39641 1.97794 3.74199 1.81417 4.19654 1.81417C4.89975 1.81417 5.3075 2.16577 5.4198 2.86898H6.41445C6.33691 2.2647 6.10697 1.80214 5.72461 1.48128C5.34226 1.16043 4.82622 1 4.17648 1C3.4198 1 2.83023 1.24799 2.40777 1.74398C1.98531 2.23998 1.77408 2.92914 1.77408 3.8115V4.26872C1.7821 4.81952 1.88838 5.30147 2.09293 5.71457C2.29748 6.12768 2.58825 6.44519 2.96525 6.66711C3.34226 6.88904 3.77541 7 4.26472 7C4.74066 7 5.16579 6.92914 5.54012 6.78743Z"></path></g>
+      <g id="badge-hspa"><path d="M5.22527 7H6.26374V1H5.22527V3.49725H2.54258V1H1.5V7H2.54258V4.33379H5.22527V7Z"></path></g>
+      <g id="badge-hspa-plus"><path d="M5.22527 7H6.26374V1H5.22527V3.49725H2.54258V1H1.5V7H2.54258V4.33379H5.22527V7ZM11.2788 3.69918H9.71291V2.03022H8.74038V3.69918H7.16621V4.61401H8.74038V6.39835H9.71291V4.61401H11.2788V3.69918Z"></path></g>
+      <g id="badge-lte"><path d="M5.76648 6.16758H3.04258V1H2V7H5.76648V6.16758ZM9.03022 1.84066H10.9011V1H6.14148V1.84066H7.99588V7H9.03022V1.84066ZM12.7308 4.32143H15.1951V3.49725H12.7308V1.84066H15.5824V1H11.6882V7H15.6113V6.16758H12.7308V4.32143Z"></path></g>
+      <g id="badge-lte-advanced"><path d="M5.76648 6.16758H3.04258V1H2V7H5.76648V6.16758ZM9.03022 1.84066H10.9011V1H6.14148V1.84066H7.99588V7H9.03022V1.84066ZM12.7308 4.32143H15.1951V3.49725H12.7308V1.84066H15.5824V1H11.6882V7H15.6113V6.16758H12.7308V4.32143ZM20.2431 3.69918H18.6772V2.03022H17.7047V3.69918H16.1305V4.61401H17.7047V6.39835H18.6772V4.61401H20.2431V3.69918Z"></path></g>
     </defs>
   </svg>
 </iron-iconset-svg>
@@ -26,8 +26,7 @@
   <svg>
     <defs>
       <g id="badge-secure" fill-rule="evenodd">
-        <path d="M1 4c0-.552.45-1 .99-1h4.02c.546 0 .99.444.99 1v3c0 .552-.45 1-.99 1H1.99C1.445 8 1 7.556 1 7V4zm2.5 1h1v1h-1V5z"></path>
-        <path d="M2 1h1v3H2V1zm3 0h1v3H5V1zm.5-1v1h-3V0h3z"></path>
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M2.25 3H2C1.44772 3 1 3.44772 1 4V7C1 7.55228 1.44772 8 2 8H6C6.55228 8 7 7.55228 7 7V4C7 3.44772 6.55228 3 6 3H5.75V2.25C5.75 1.2835 4.9665 0.5 4 0.5C3.0335 0.5 2.25 1.2835 2.25 2.25V3ZM3.25 3H4.75V2.25C4.75 1.83579 4.41421 1.5 4 1.5C3.58579 1.5 3.25 1.83579 3.25 2.25V3Z"></path>
       </g>
     </defs>
   </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_ip_config.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_ip_config.html
index b40f0e55b9f..a55a625f35a 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_ip_config.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_ip_config.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<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.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_indicator.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="network_property_list_mojo.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.html
index 6a5b872e991..a4732962b83 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.html
@@ -1,8 +1,8 @@
 <link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="network_list_item.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_style_css.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">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.js b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.js
index 8dbece4d0fa..2fed17a7beb 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list.js
@@ -95,7 +95,7 @@ Polymer({
       return item.showBeforeNetworksList === true;
     });
     const afterNetworks = this.customItems.filter(function(item) {
-      return item.showBeforeNetworksList === false;
+      return item.showBeforeNetworksList !== true;
     });
     this.listItems_ = beforeNetworks.concat(this.networks, afterNetworks);
     this.restoreScroll(this.$.networkList);
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list_item.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list_item.html
index 78530b34ead..cab8b8eed10 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_list_item.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_list_item.html
@@ -1,14 +1,14 @@
 <link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="network_icon.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.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/i18n_behavior.html">
+<link rel="import" href="onc_mojo.html">
+<link rel="import" href="../../../cr_elements/cr_icon_button/cr_icon_button.html">
+<link rel="import" href="../../../cr_elements/icons.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_indicator.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 
 <dom-module id="network-list-item">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_nameservers.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_nameservers.html
index d953a8d53a1..0c68cc71ce8 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_nameservers.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_nameservers.html
@@ -1,12 +1,12 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/cr_radio_button/cr_radio_button.html">
+<link rel="import" href="../../../cr_elements/cr_radio_group/cr_radio_group.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_indicator.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_password_input.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_password_input.html
index 3afeef1f513..66e8763a97d 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_password_input.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_password_input.html
@@ -1,11 +1,11 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.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/cr_icons_css.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_indicator_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="network_config_element_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.html
index 06c91836a69..24c4de57996 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.html
@@ -1,10 +1,10 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator_mojo.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="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_indicator_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../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="network_shared_css.html">
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy.html
index f46687fd9ac..7df225d8a45 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy.html
@@ -1,13 +1,13 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
-<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior_mojo.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/md_select_css.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="../../../cr_elements/hidden_style_css.html">
+<link rel="import" href="../../../cr_elements/policy/cr_policy_network_behavior_mojo.html">
+<link rel="import" href="../../../html/assert.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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="network_proxy_exclusions.html">
 <link rel="import" href="network_proxy_input.html">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.html
index 560812c1514..c9f00cb042d 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_exclusions.html
@@ -1,9 +1,9 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.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="../../../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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
 <dom-module id="network-proxy-exclusions">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_input.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_input.html
index 0df33a4b8ab..6e4dcff6a33 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_input.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_proxy_input.html
@@ -1,7 +1,7 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="network_shared_css.html">
 
 <dom-module id="network-proxy-input">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.html
index fbd0f4dfd80..e4811841c98 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.html
@@ -2,8 +2,8 @@
 
 <link rel="import" href="network_list.html">
 <link rel="import" href="network_listener_behavior.html">
-<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="onc_mojo.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 
 <dom-module id="network-select">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.js b/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.js
index 0ef4fdfcf16..1cb4d6e24a8 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_select.js
@@ -95,10 +95,13 @@ Polymer({
     this.refreshNetworks();
 
     const INTERVAL_MS = 10 * 1000;
-    const kAll = chromeos.networkConfig.mojom.NetworkType.kAll;
-    this.networkConfig_.requestNetworkScan(kAll);
+    // Request only WiFi network scans. Tether and Cellular scans are not useful
+    // here. Cellular scans are disruptive and should only be triggered by
+    // explicit user action.
+    const kWiFi = chromeos.networkConfig.mojom.NetworkType.kWiFi;
+    this.networkConfig_.requestNetworkScan(kWiFi);
     this.scanIntervalId_ = window.setInterval(function() {
-      this.networkConfig_.requestNetworkScan(kAll);
+      this.networkConfig_.requestNetworkScan(kWiFi);
     }.bind(this), INTERVAL_MS);
   },
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_shared_css.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_shared_css.html
index 5953bebc8c2..0d0791d8b38 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_shared_css.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_shared_css.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
 
  <!-- Common styles for network elements. -->
 
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/network_siminfo.html b/chromium/ui/webui/resources/cr_components/chromeos/network/network_siminfo.html
index 39a8d153a18..181b8233b85 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/network_siminfo.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/network_siminfo.html
@@ -1,13 +1,13 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="onc_mojo.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="../../../cr_elements/icons.html">
+<link rel="import" href="../../../html/assert.html">
+<link rel="import" href="../../../html/cr/ui/focus_without_ink.html">
+<link rel="import" href="../../../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="network_password_input.html">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.html b/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.html
index 616c8131bc2..fa7ff789d05 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.html
@@ -1,2 +1,2 @@
-<link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="../../../html/assert.html">
 <script src="onc_mojo.js"></script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.js b/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.js
index 16847b73c82..a193123d179 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/onc_mojo.js
@@ -147,6 +147,8 @@ class OncMojo {
         return 'Uninitialized';
       case DeviceStateType.kDisabled:
         return 'Disabled';
+      case DeviceStateType.kDisabling:
+        return 'Disabling';
       case DeviceStateType.kEnabling:
         return 'Enabling';
       case DeviceStateType.kEnabled:
@@ -161,27 +163,24 @@ class OncMojo {
   }
 
   /**
-   * @param {string} value
-   * @return {!chromeos.networkConfig.mojom.DeviceStateType}
+   * @param {!chromeos.networkConfig.mojom.DeviceStateType} value
+   * @return {boolean}
    */
-  static getDeviceStateTypeFromString(value) {
+  static deviceStateIsIntermediate(value) {
     const DeviceStateType = chromeos.networkConfig.mojom.DeviceStateType;
     switch (value) {
-      case 'Uninitialized':
-        return DeviceStateType.kUninitialized;
-      case 'Disabled':
-        return DeviceStateType.kDisabled;
-      case 'Enabling':
-        return DeviceStateType.kEnabling;
-      case 'Enabled':
-        return DeviceStateType.kEnabled;
-      case 'Prohibited':
-        return DeviceStateType.kProhibited;
-      case 'Unavailable':
-        return DeviceStateType.kUnavailable;
+      case DeviceStateType.kUninitialized:
+      case DeviceStateType.kDisabling:
+      case DeviceStateType.kEnabling:
+      case DeviceStateType.kUnavailable:
+        return true;
+      case DeviceStateType.kDisabled:
+      case DeviceStateType.kEnabled:
+      case DeviceStateType.kProhibited:
+        return false;
     }
-    assertNotReached('Unexpected value: ' + value);
-    return DeviceStateType.kUnavailable;
+    assertNotReached('Unexpected enum value: ' + OncMojo.getEnumString(value));
+    return false;
   }
 
   /**
@@ -590,7 +589,6 @@ class OncMojo {
           security: mojom.SecurityType.kNone,
           signalStrength: 0,
           ssid: '',
-          isSyncable: false,
         };
         break;
       default:
@@ -729,6 +727,7 @@ class OncMojo {
             security: mojom.SecurityType.kNone,
             signalStrength: 0,
             isSyncable: false,
+            isConfiguredByActiveUser: false,
           }
         };
         break;
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0.svg
index d9729d60cd0..1387407428c 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.44247 16.7281C9.72802 17.0905 10.2698 17.0905 10.5554 16.7289L17.8425 7.49646C18.1038 7.16533 18.0317 6.68099 17.6876 6.44135C16.4955 5.61135 13.7328 4 10 4C6.26792 4 3.50455 5.61135 2.31239 6.44135C1.96831 6.68099 1.89621 7.16533 2.15749 7.49646L9.44247 16.7281ZM4.61134 7.37751L9.99932 14.2053L15.3886 7.37739C14.1425 6.71268 12.2788 6 10 6C7.72159 6 5.85753 6.71277 4.61134 7.37751Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0_with_x.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0_with_x.svg
index 299bcfcb7fe..16b158e658e 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0_with_x.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_0_with_x.svg
@@ -1,7 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#000" fill-opacity=".3" fill-rule="nonzero" d="M14.6412814,12 L19.7888889,5.58888889 C19.4111111,5.3 15.6444444,2.22222222 10,2.22222222 C4.35555556,2.22222222 0.588888889,5.3 0.211111111,5.58888889 L9.98888889,17.7666667 L10.0111111,17.7666667 L12,15.289596 L12,12 L14.6412814,12 Z"/>
-    <polygon points="0 0 20 0 20 20 0 20"/>
-    <polygon fill="#B2B2B2" fill-rule="nonzero" points="18.833 13.588 18.246 13 15.917 15.329 13.588 13 13 13.588 15.329 15.917 13 18.246 13.588 18.833 15.917 16.504 18.246 18.833 18.833 18.246 16.504 15.917"/>
-  </g>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.44247 16.7281C9.72802 17.0905 10.2698 17.0905 10.5554 16.7289L17.8425 7.49646C18.1038 7.16533 18.0317 6.68099 17.6876 6.44135C16.4955 5.61135 13.7328 4 10 4C6.26792 4 3.50455 5.61135 2.31239 6.44135C1.96831 6.68099 1.89621 7.16533 2.15749 7.49646L9.44247 16.7281ZM4.61134 7.37751L9.99932 14.2053L15.3886 7.37739C14.1425 6.71268 12.2788 6 10 6C7.72159 6 5.85753 6.71277 4.61134 7.37751Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6667 9L12 7.66667L11.3333 7L10 8.33333L8.66667 7L8 7.66667L9.33333 9L8 10.3333L8.66667 11L10 9.66667L11.3333 11L12 10.3333L10.6667 9Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_1.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_1.svg
index 9098185d86b..7e4e49c8ac5 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_1.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"/>
-  <path d="M5.558 12.402L10 17.992V18l.008-.008 4.442-5.59c-.233-.177-1.925-1.57-4.45-1.57-2.525 0-4.217 1.393-4.442 1.57z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.44247 16.7281C9.72802 17.0905 10.2698 17.0905 10.5554 16.7289L17.8425 7.49646C18.1038 7.16533 18.0317 6.68099 17.6876 6.44135C16.4955 5.61135 13.7328 4 10 4C6.26792 4 3.50455 5.61135 2.31239 6.44135C1.96831 6.68099 1.89621 7.16533 2.15749 7.49646L9.44247 16.7281ZM4.61134 7.37751L9.99932 14.2053L15.3886 7.37739C14.1425 6.71268 12.2788 6 10 6C7.72159 6 5.85753 6.71277 4.61134 7.37751Z"/>
+<path d="M13.8332 12.5761C12.7208 12.237 11.4317 12 10 12C8.56817 12 7.27891 12.2372 6.16626 12.5764L9.44247 16.7281C9.72802 17.0905 10.2698 17.0905 10.5554 16.7289L13.8332 12.5761Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_2.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_2.svg
index 0b14317bc7e..ce2f84d3f63 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_2.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_2.svg
@@ -1,4 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"/>
-  <path d="M3.992 10.452l6 7.548H10l.008-.008 6-7.55c-.3-.226-2.59-2.11-6.008-2.11-3.417 0-5.708 1.884-6.008 2.12z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+  <path fill-rule="evenodd" d="M7.99999976,4.4408921e-15 C11.7328,4.4408921e-15 14.4955,1.61135 15.6876,2.44135 C16.0317,2.68099 16.1038,3.16533 15.8425,3.49646 L15.8425,3.49646 L8.5554,12.7289 C8.2698,13.0905 7.72802,13.0905 7.44247,12.7281 L7.44247,12.7281 L0.15749,3.49646 C-0.10379,3.16533 -0.03169,2.68099 0.31239,2.44135 C1.50455,1.61135 4.26792,4.4408921e-15 7.99999976,4.4408921e-15 Z M7.9986,5 C9.23601,5 10.350948,5.2101302 11.3111193,5.50860386 L11.6254,5.6112 L11.6254,5.6112 C12.314,4.73885 13.3886,3.37739 13.3886,3.37739 C12.1425,2.71268 10.2788,2 8,2 C5.72159,2 3.85753,2.71277 2.61134,3.37751 C2.61134,3.37751 3.36107,4.32758 4.3736,5.61069 C5.40153,5.25916 6.62474,5 7.9986,5 Z" transform="translate(2 4)"/>
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_3.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_3.svg
index 261d2e51b5e..38bfe4f6302 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_3.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_3.svg
@@ -1,4 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"/>
-  <path d="M2.942 9.143l7.05 8.85L10 18l.008-.008 7.05-8.85C16.7 8.867 14.008 6.668 10 6.668s-6.7 2.2-7.058 2.476z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5554 16.7289C10.2698 17.0905 9.72802 17.0905 9.44247 16.7281L2.15749 7.49646C1.89621 7.16533 1.96831 6.68099 2.31239 6.44135C3.50455 5.61135 6.26792 4 10 4C13.7328 4 16.4955 5.61135 17.6876 6.44135C18.0317 6.68099 18.1038 7.16533 17.8425 7.49646L10.5554 16.7289ZM5.46762 8.4626L4.61134 7.37751C5.85753 6.71277 7.72159 6 10 6C12.2788 6 14.1425 6.71268 15.3886 7.37739L14.5315 8.46329C13.348 7.94707 11.8035 7.5 9.99865 7.5C8.19498 7.5 6.65099 7.94668 5.46762 8.4626Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_4.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_4.svg
index 603eea720fd..c741f5e2b42 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_4.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_4.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8425 7.49646C18.1038 7.16533 18.0317 6.68099 17.6876 6.44135C16.4955 5.61135 13.7328 4 10 4C6.26792 4 3.50455 5.61135 2.31239 6.44135C1.96831 6.68099 1.89621 7.16533 2.15749 7.49646L9.44247 16.7281C9.72802 17.0905 10.2698 17.0905 10.5554 16.7289L17.8425 7.49646Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_off.svg b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_off.svg
index 8dfadca8a80..aa572361e47 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_off.svg
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network/wifi_off.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px">
-  <path d="M9.7 2.3c-1.25 0-2.408.158-3.458.4l8.608 8.6 4.55-5.667C19.025 5.35 15.292 2.3 9.7 2.3zM2.425 1L1.367 2.067l1.708 1.716C1.292 4.6.192 5.483 0 5.633L10 18l2.958-4.342 2.767 2.767 1.058-1.058-2.883-2.884L2.425 1z"/>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 6C7.96011 6 6.14746 6.5389 4.6073 7.37238L9.99933 14.2053L15.3926 7.37228C13.8524 6.53869 12.0402 6 10 6ZM17.8425 7.49646L10.5554 16.7289C10.2698 17.0905 9.72802 17.0905 9.44247 16.7281L2.15749 7.49646C1.89621 7.16533 1.96831 6.68099 2.31239 6.44135C3.50455 5.61135 6.26792 4 10 4C13.7328 4 16.4955 5.61135 17.6876 6.44135C18.0317 6.68099 18.1038 7.16533 17.8425 7.49646Z" />
 </svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network_health/BUILD.gn b/chromium/ui/webui/resources/cr_components/chromeos/network_health/BUILD.gn
new file mode 100644
index 00000000000..6c1f0d8f6ce
--- /dev/null
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network_health/BUILD.gn
@@ -0,0 +1,53 @@
+# 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.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+assert(is_chromeos, "Only ChromeOS components belong here.")
+
+# JS type check for Polymer 2 and 3
+
+js_type_check("closure_compile") {
+  deps = [ ":network_health_summary" ]
+}
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":network_health_summary.m" ]
+}
+
+# Sources with Polymer 3 generated modules
+
+js_library("network_health_summary") {
+  deps = [
+    "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("network_health_summary.m") {
+  sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.m.js" ]
+  deps = [
+    "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":network_health_summary_module" ]
+}
+
+# polymer_modulizer for converting Polymer2 to Polymer3
+
+polymer_modulizer("network_health_summary") {
+  js_file = "network_health_summary.js"
+  html_file = "network_health_summary.html"
+  html_type = "dom-module"
+}
+
+group("polymer3_elements") {
+  public_deps = [ ":network_health_summary_module" ]
+}
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.html b/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.html
new file mode 100644
index 00000000000..7d03f663ac9
--- /dev/null
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.html
@@ -0,0 +1,49 @@
+<link rel="import" href="../../../html/polymer.html">
+
+<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
+<link rel="import" href="chrome://resources/mojo/chromeos/services/network_health/public/mojom/network_health.mojom.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+
+
+<dom-module id="network-health-summary">
+  <template>
+    <style>
+      table {
+        width: 100%;
+      }
+
+      tr,
+      td {
+        border: 1px solid rgb(220, 220, 220);
+        font-size: 13px;
+        padding: 5px;
+      }
+
+      .table-header {
+        font-size: 15px;
+        font-weight: bold;
+        padding-bottom: 15px;
+      }
+    </style>
+    <table>
+      <tr class="table-header">
+        <td>[[i18n('OncName')]]</td>
+        <td>[[i18n('OncType')]]</td>
+        <td>[[i18n('NetworkHealthState')]]</td>
+        <td>[[i18n('OncMacAddress')]]</td>
+      </tr>
+      <hr>
+      <template is="dom-repeat"
+          items="[[networkHealthState_.networks]]" as="network">
+        <tr>
+          <td>[[network.name]]</td>
+          <td>[[getNetworkTypeString_(network.type)]]</td>
+          <td>[[getNetworkStateString_(network.state)]]</td>
+          <td>[[network.macAddress]]</td>
+        </tr>
+      </template>
+    </table>
+  </template>
+  <script src="network_health_summary.js"></script>
+</dom-module>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.js b/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.js
new file mode 100644
index 00000000000..cc336b99b5f
--- /dev/null
+++ b/chromium/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.js
@@ -0,0 +1,94 @@
+// 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.
+
+/**
+ * @fileoverview Polymer element for displaying NetworkHealth properties.
+ */
+Polymer({
+  is: 'network-health-summary',
+
+  behaviors: [
+    I18nBehavior,
+  ],
+
+  /**
+   * Network Health State object.
+   * @private
+   * @type {chromeos.networkHealth.mojom.NetworkHealthState}
+   */
+  networkHealthState_: null,
+
+  /**
+   * Network Health mojo remote.
+   * @private
+   * @type {?chromeos.networkHealth.mojom.NetworkHealthServiceRemote}
+   */
+  networkHealth_: null,
+
+  /** @override */
+  created() {
+    this.networkHealth_ =
+        chromeos.networkHealth.mojom.NetworkHealthService.getRemote();
+  },
+
+  /** @override */
+  attached() {
+    this.requestNetworkHealth_();
+
+    // Automatically refresh Network Health every second.
+    window.setInterval(() => {
+      this.requestNetworkHealth_();
+    }, 1000);
+  },
+
+  /**
+   * Requests the NetworkHealthState and updates the page.
+   * @private
+   */
+  requestNetworkHealth_() {
+    this.networkHealth_.getHealthSnapshot().then(result => {
+      this.networkHealthState_ = result.state;
+    });
+  },
+
+  /**
+   * Returns a string for the given NetworkState.
+   * @private
+   * @param {chromeos.networkHealth.mojom.NetworkState} state
+   * @return {string}
+   */
+  getNetworkStateString_(state) {
+    switch (state) {
+      case chromeos.networkHealth.mojom.NetworkState.kUninitialized:
+        return this.i18n('NetworkHealthStateUninitialized');
+      case chromeos.networkHealth.mojom.NetworkState.kDisabled:
+        return this.i18n('NetworkHealthStateDisabled');
+      case chromeos.networkHealth.mojom.NetworkState.kProhibited:
+        return this.i18n('NetworkHealthStateProhibited');
+      case chromeos.networkHealth.mojom.NetworkState.kNotConnected:
+        return this.i18n('NetworkHealthStateNotConnected');
+      case chromeos.networkHealth.mojom.NetworkState.kConnecting:
+        return this.i18n('NetworkHealthStateConnecting');
+      case chromeos.networkHealth.mojom.NetworkState.kPortal:
+        return this.i18n('NetworkHealthStatePortal');
+      case chromeos.networkHealth.mojom.NetworkState.kConnected:
+        return this.i18n('NetworkHealthStateConnected');
+      case chromeos.networkHealth.mojom.NetworkState.kOnline:
+        return this.i18n('NetworkHealthStateOnline');
+    }
+
+    assertNotReached('Unexpected enum value');
+    return '';
+  },
+
+  /**
+   * Returns a string for the given NetworkType.
+   * @private
+   * @param {chromeos.networkConfig.mojom.NetworkType} type
+   * @return {string}
+   */
+  getNetworkTypeString_(type) {
+    return this.i18n('OncType' + OncMojo.getNetworkTypeString(type));
+  },
+});
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html
index 83290e9a758..be24319c94a 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html
@@ -1,3 +1,3 @@
-<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="../../../html/cr.html">
 
 <script src="lock_screen_constants.js"></script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html
index 36d6749581c..1dc6eb3d818 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html
@@ -2,14 +2,14 @@
                              what i18n to use for keypad, ie, does 1 ABC make
                              sense in every scenario? -->
 
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/cr_icon_button/cr_icon_button.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/icons.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="pin_keyboard_icon.html">
@@ -119,11 +119,12 @@
         font-size: 20px;
       }
 
+      #pinInput::part(input) {
+        font-size: 28px;
+      }
+
       #pinInput {
         --cr-input-error-display: none;
-        --cr-input-input: {
-          font-size: 28px;
-        };
         --cr-input-letter-spacing: var(--pin-keyboard-input-letter-spacing,
                                        18px);
         --cr-input-padding-end: 0;
@@ -164,7 +165,7 @@
             is-input-rtl$="[[isInputRtl_(value)]]" aria-label="[[ariaLabel]]"
             make-contrast$="[[hasInputOrFocus_(value, focused_)]]" invalid="[[hasError]]"
             placeholder="[[getInputPlaceholder_(enablePassword,
-                enablePlaceholder)]]"
+                enablePlaceholder)]]" inputmode="none"
             on-keydown="onInputKeyDown_" force-underline="true"
             disabled="[[disabled]]">
         </cr-input>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
index 6aaf8c5599c..7dfb928e333 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 
@@ -19,4 +19,4 @@
       </g>
     </defs>
   </svg>
-</iron-iconset-svg>
-\ No newline at end of file
+</iron-iconset-svg>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html
index 4babf0c6455..2bc0ed34b6d 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html
@@ -1,11 +1,11 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.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="lock_screen_constants.html">
+<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="../../../cr_elements/icons.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/assert.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
 <link rel="import" href="pin_keyboard.html">
 
 <!--
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.html b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.html
index 4479f4048c2..096fa65af74 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.html
@@ -1,25 +1,35 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.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/i18n_behavior.html">
-<link rel="import" href="chrome://resources/html/load_time_data.html">
-<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
-<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
+<link rel="import" href="../../../cr_elements/cr_checkbox/cr_checkbox.html">
+<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
+<link rel="import" href="../../../cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.html">
+<link rel="import" href="../../../cr_elements/icons.html">
+<link rel="import" href="../../../cr_elements/shared_style_css.html">
+<link rel="import" href="../../../cr_elements/shared_vars_css.html">
+<link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="../../../html/load_time_data.html">
+<link rel="import" href="../../../cr_elements/md_select_css.html">
+<link rel="import" href="../../../html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="smb_browser_proxy.html">
 
 <dom-module id="add-smb-share-dialog">
   <template>
     <style include="cr-shared-style md-select">
+      cr-dialog::part(wrapper) {
+        /* Subtract the internal padding in <cr-dialog>. */
+        padding: calc(24px - 20px);
+      }
+
+      [slot='button-container']  {
+        padding-bottom: 20px;
+        padding-top: 32px;
+      }
+
       #dialog [slot=body] {
-        height: 440px;
+        height: 390px;
       }
 
       .md-select {
@@ -61,7 +71,7 @@
     </style>
 
     <cr-dialog id="dialog" exportparts="dialog">
-      <div slot="title">[[i18n('addSmbShare')]]</div>
+      <div slot="title" part="title">[[i18n('addSmbShare')]]</div>
       <div slot="body" spellcheck="false">
         <div id="general-error-container">
           <div hidden="[[!shouldShowGeneralError_(currentMountError_)]]">
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.html b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.html
index 2d494727081..e904e891c61 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.html
+++ b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.html
@@ -1,2 +1,2 @@
-<link rel="import" href="chrome://resources/html/cr.html">
-<script src="smb_browser_proxy.js"> </script>
-\ No newline at end of file
+<link rel="import" href="../../../html/cr.html">
+<script src="smb_browser_proxy.js"> </script>
diff --git a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.js b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.js
index 90d2f4a7db6..4796b1a19a1 100644
--- a/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.js
+++ b/chromium/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.js
@@ -7,7 +7,7 @@
  * interact with the browser. Used only on Chrome OS.
  */
 
-// #import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
+// #import {addSingletonGetter, sendWithPromise} from '../../../js/cr.m.js';
 
 /**
  *  @enum {number}
diff --git a/chromium/ui/webui/resources/cr_components/cr_components_images.grdp b/chromium/ui/webui/resources/cr_components/cr_components_images.grdp
index 7c1186fe555..70d2a577251 100644
--- a/chromium/ui/webui/resources/cr_components/cr_components_images.grdp
+++ b/chromium/ui/webui/resources/cr_components/cr_components_images.grdp
@@ -40,51 +40,43 @@
     <!-- NetworkIcon Images -->
     <include name="IDR_CR_ELEMENTS_CELLULAR_0_WITH_X_SVG"
              file="cr_components/chromeos/network/cellular_0_with_x.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_0_SVG"
              file="cr_components/chromeos/network/cellular_0.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_1_SVG"
              file="cr_components/chromeos/network/cellular_1.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_2_SVG"
              file="cr_components/chromeos/network/cellular_2.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_3_SVG"
              file="cr_components/chromeos/network/cellular_3.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_4_SVG"
              file="cr_components/chromeos/network/cellular_4.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_CELLULAR_OFF_SVG"
              file="cr_components/chromeos/network/cellular_off.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_ETHERNET_SVG"
-             file="cr_components/chromeos/network/ethernet.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/ethernet.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_VPN_SVG"
-             file="cr_components/chromeos/network/vpn.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/vpn.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_0_WITH_X_SVG"
              file="cr_components/chromeos/network/wifi_0_with_x.svg"
-             type="BINDATA" compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_0_SVG"
-             file="cr_components/chromeos/network/wifi_0.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_0.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_1_SVG"
-             file="cr_components/chromeos/network/wifi_1.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_1.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_2_SVG"
-             file="cr_components/chromeos/network/wifi_2.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_2.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_3_SVG"
-             file="cr_components/chromeos/network/wifi_3.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_3.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_4_SVG"
-             file="cr_components/chromeos/network/wifi_4.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_4.svg" type="BINDATA" />
     <include name="IDR_CR_ELEMENTS_WIFI_OFF_SVG"
-             file="cr_components/chromeos/network/wifi_off.svg" type="BINDATA"
-             compress="gzip" />
+             file="cr_components/chromeos/network/wifi_off.svg" type="BINDATA" />
   </if>
 </grit-part>
diff --git a/chromium/ui/webui/resources/cr_components/cr_components_resources.grdp b/chromium/ui/webui/resources/cr_components/cr_components_resources.grdp
index 5b6ac7a9a3e..2e2468044c8 100644
--- a/chromium/ui/webui/resources/cr_components/cr_components_resources.grdp
+++ b/chromium/ui/webui/resources/cr_components/cr_components_resources.grdp
@@ -4,430 +4,333 @@
     <!-- Chrome OS Custom Elements. When optimize_webui is true these are -->
     <!-- vulcanized and are not included individually. -->
     <structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_HTML"
-               file="cr_components/chromeos/bluetooth_dialog.html"
-               type="chrome_html"
-               compress="gzip" />
+               file="cr_components/chromeos/bluetooth/bluetooth_dialog.html"
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_JS"
-               file="cr_components/chromeos/bluetooth_dialog.js"
-               type="chrome_html"
-               compress="gzip" />
+               file="cr_components/chromeos/bluetooth/bluetooth_dialog.js"
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_APNLIST_HTML"
                file="cr_components/chromeos/network/network_apnlist.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_APNLIST_JS"
                file="cr_components/chromeos/network/network_apnlist.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CHOOSE_MOBILE_HTML"
                file="cr_components/chromeos/network/network_choose_mobile.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CHOOSE_MOBILE_JS"
                file="cr_components/chromeos/network/network_choose_mobile.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_HTML"
                file="cr_components/chromeos/network/network_config.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_JS"
                file="cr_components/chromeos/network/network_config.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_ELEMENT_BEHAVIOR_HTML"
                file="cr_components/chromeos/network/network_config_element_behavior.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_ELEMENT_BEHAVIOR_JS"
                file="cr_components/chromeos/network/network_config_element_behavior.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_INPUT_HTML"
                file="cr_components/chromeos/network/network_config_input.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_INPUT_JS"
                file="cr_components/chromeos/network/network_config_input.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_SELECT_HTML"
                file="cr_components/chromeos/network/network_config_select.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_SELECT_JS"
                file="cr_components/chromeos/network/network_config_select.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_TOGGLE_HTML"
                file="cr_components/chromeos/network/network_config_toggle.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_TOGGLE_JS"
                file="cr_components/chromeos/network/network_config_toggle.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_IP_CONFIG_HTML"
                file="cr_components/chromeos/network/network_ip_config.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_IP_CONFIG_JS"
                file="cr_components/chromeos/network/network_ip_config.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_NAMESERVERS_HTML"
                file="cr_components/chromeos/network/network_nameservers.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_NAMESERVERS_JS"
                file="cr_components/chromeos/network/network_nameservers.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PASSWORD_INPUT_HTML"
                file="cr_components/chromeos/network/network_password_input.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PASSWORD_INPUT_JS"
                file="cr_components/chromeos/network/network_password_input.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROPERTY_LIST_MOJO_HTML"
                file="cr_components/chromeos/network/network_property_list_mojo.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROPERTY_LIST_MOJO_JS"
                file="cr_components/chromeos/network/network_property_list_mojo.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_HTML"
                file="cr_components/chromeos/network/network_proxy.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_JS"
                file="cr_components/chromeos/network/network_proxy.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_EXCLUSIONS_HTML"
                file="cr_components/chromeos/network/network_proxy_exclusions.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_EXCLUSIONS_JS"
                file="cr_components/chromeos/network/network_proxy_exclusions.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_INPUT_HTML"
                file="cr_components/chromeos/network/network_proxy_input.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_PROXY_INPUT_JS"
                file="cr_components/chromeos/network/network_proxy_input.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_SIMINFO_HTML"
                file="cr_components/chromeos/network/network_siminfo.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_SIMINFO_JS"
                file="cr_components/chromeos/network/network_siminfo.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_SHARED_CSS_HTML"
                file="cr_components/chromeos/network/network_shared_css.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
   </if>
   <if expr="chromeos">
     <!-- Shared between settings and OOBE, which is not vulcanized. -->
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_PIN_KEYBOARD_HTML"
                file="cr_components/chromeos/quick_unlock/pin_keyboard.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_PIN_KEYBOARD_JS"
                file="cr_components/chromeos/quick_unlock/pin_keyboard.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_SETUP_PIN_KEYBOARD_JS"
                file="cr_components/chromeos/quick_unlock/setup_pin_keyboard.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_SETUP_PIN_KEYBOARD_HTML"
                file="cr_components/chromeos/quick_unlock/setup_pin_keyboard.html"
-               type="chrome_html"
-                compress="gzip"/>
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_PIN_KEYBOARD_ICON_HTML"
                file="cr_components/chromeos/quick_unlock/pin_keyboard_icon.html"
-               type="chrome_html"
-               compress="gzip"/>
+               type="chrome_html"/>
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_LOCK_SCREEN_CONSTANTS_JS"
                file="cr_components/chromeos/quick_unlock/lock_screen_constants.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_QUICK_UNLOCK_LOCK_SCREEN_CONSTANTS_HTML"
                file="cr_components/chromeos/quick_unlock/lock_screen_constants.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
 
     <!-- Shared between cellular setup flow and OOBE. -->
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_CELLULAR_SETUP_HTML"
                file="cr_components/chromeos/cellular_setup/cellular_setup.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_CELLULAR_SETUP_JS"
                file="cr_components/chromeos/cellular_setup/cellular_setup.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_MOJO_INTERFACE_PROVIDER_HTML"
                file="cr_components/chromeos/cellular_setup/mojo_interface_provider.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_MOJO_INTERFACE_PROVIDER_JS"
                file="cr_components/chromeos/cellular_setup/mojo_interface_provider.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BUTTON_BAR_HTML"
                file="cr_components/chromeos/cellular_setup/button_bar.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BUTTON_BAR_JS"
                file="cr_components/chromeos/cellular_setup/button_bar.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BASE_PAGE_HTML"
                file="cr_components/chromeos/cellular_setup/base_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BASE_PAGE_JS"
                file="cr_components/chromeos/cellular_setup/base_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_SIM_DETECT_PAGE_HTML"
                file="cr_components/chromeos/cellular_setup/sim_detect_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_SIM_DETECT_PAGE_JS"
                file="cr_components/chromeos/cellular_setup/sim_detect_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_PROVISIONING_PAGE_HTML"
                file="cr_components/chromeos/cellular_setup/provisioning_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_PROVISIONING_PAGE_JS"
                file="cr_components/chromeos/cellular_setup/provisioning_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_FINAL_PAGE_HTML"
                file="cr_components/chromeos/cellular_setup/final_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_FINAL_PAGE_JS"
                file="cr_components/chromeos/cellular_setup/final_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_WEBVIEW_POST_UTIL_HTML"
                file="cr_components/chromeos/cellular_setup/webview_post_util.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_WEBVIEW_POST_UTIL_JS"
                file="cr_components/chromeos/cellular_setup/webview_post_util.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
 
     <!-- Shared between MultiDevice setup flow and OOBE. -->
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BROWSER_PROXY_HTML"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BROWSER_PROXY_JS"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_BUTTON_BAR_HTML"
                file="cr_components/chromeos/multidevice_setup/button_bar.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_BUTTON_BAR_JS"
                file="cr_components/chromeos/multidevice_setup/button_bar.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_FAKE_MOJO_SERVICE_HTML"
                file="cr_components/chromeos/multidevice_setup/fake_mojo_service.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_FAKE_MOJO_SERVICE_JS"
                file="cr_components/chromeos/multidevice_setup/fake_mojo_service.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_ICONS_HTML"
                file="cr_components/chromeos/multidevice_setup/icons.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MOJO_API_HTML"
                file="cr_components/chromeos/multidevice_setup/mojo_api.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MOJO_API_JS"
                file="cr_components/chromeos/multidevice_setup/mojo_api.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_HTML"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_JS"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_DELEGATE_HTML"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_DELEGATE_JS"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SHARED_CSS_HTML"
                file="cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_PASSWORD_PAGE_HTML"
                file="cr_components/chromeos/multidevice_setup/password_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_PASSWORD_PAGE_JS"
                file="cr_components/chromeos/multidevice_setup/password_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_SETUP_SUCCEEDED_PAGE_HTML"
                file="cr_components/chromeos/multidevice_setup/setup_succeeded_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_SETUP_SUCCEEDED_PAGE_JS"
                file="cr_components/chromeos/multidevice_setup/setup_succeeded_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_START_SETUP_PAGE_HTML"
                file="cr_components/chromeos/multidevice_setup/start_setup_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_START_SETUP_PAGE_JS"
                file="cr_components/chromeos/multidevice_setup/start_setup_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_CONTAINER_BEHAVIOR_HTML"
                file="cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_CONTAINER_BEHAVIOR_JS"
                file="cr_components/chromeos/multidevice_setup/ui_page_container_behavior.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_HTML"
                file="cr_components/chromeos/multidevice_setup/ui_page.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_JS"
                file="cr_components/chromeos/multidevice_setup/ui_page.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
 
     <!-- For use in Settings, oobe, configuration dialogs, and debug UI. -->
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_MOJO_INTERFACE_PROVIDER_HTML"
                file="cr_components/chromeos/network/mojo_interface_provider.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_NETWORK_MOJO_INTERFACE_PROVIDER_JS"
                file="cr_components/chromeos/network/mojo_interface_provider.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
+    <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_HEALTH_SUMMARY_HTML"
+               file="cr_components/chromeos/network_health/network_health_summary.html"
+               type="chrome_html" />
+    <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_HEALTH_SUMMARY_JS"
+               file="cr_components/chromeos/network_health/network_health_summary.js"
+               type="chrome_html" />
 
     <!-- Shared between settings and add new share flow. -->
     <structure name="IDR_WEBUI_CHROMEOS_SMB_SHARES_SMB_BROWSER_PROXY_HTML"
                file="cr_components/chromeos/smb_shares/smb_browser_proxy.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_SMB_SHARES_SMB_BROWSER_PROXY_JS"
                file="cr_components/chromeos/smb_shares/smb_browser_proxy.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_SMB_SHARES_ADD_SMB_SHARE_DIALOG_HTML"
                file="cr_components/chromeos/smb_shares/add_smb_share_dialog.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_WEBUI_CHROMEOS_SMB_SHARES_ADD_SMB_SHARE_DIALOG_JS"
                file="cr_components/chromeos/smb_shares/add_smb_share_dialog.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
 
     <!-- Used to render network-list and related subcomponents. -->
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_ICON_HTML"
                file="cr_components/chromeos/network/network_icon.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_ICON_JS"
                file="cr_components/chromeos/network/network_icon.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_HTML"
                file="cr_components/chromeos/network/network_list.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_JS"
                file="cr_components/chromeos/network/network_list.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_ITEM_HTML"
                file="cr_components/chromeos/network/network_list_item.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_ITEM_JS"
                file="cr_components/chromeos/network/network_list_item.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_TYPES_HTML"
                file="cr_components/chromeos/network/network_list_types.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LIST_TYPES_JS"
                file="cr_components/chromeos/network/network_list_types.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LISTENER_BEHAVIOR_HTML"
                file="cr_components/chromeos/network/network_listener_behavior.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_LISTENER_BEHAVIOR_JS"
                file="cr_components/chromeos/network/network_listener_behavior.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_SELECT_HTML"
                file="cr_components/chromeos/network/network_select.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_SELECT_JS"
                file="cr_components/chromeos/network/network_select.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_NETWORK_ICONS_HTML"
                file="cr_components/chromeos/network/network_icons.html"
                type="chrome_html"
-               preprocess="true"
-               compress="gzip" />
+               preprocess="true" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_ONC_MOJO_HTML"
                file="cr_components/chromeos/network/onc_mojo.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     <structure name="IDR_CR_COMPONENTS_CHROMEOS_ONC_MOJO_JS"
                file="cr_components/chromeos/network/onc_mojo.js"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
   </if>
   <structure name="IDR_WEBUI_MANAGED_FOOTNOTE_HTML"
              file="cr_components/managed_footnote/managed_footnote.html"
-             type="chrome_html"
-             compress="gzip" />
+             type="chrome_html" />
   <structure name="IDR_WEBUI_MANAGED_FOOTNOTE_JS"
              file="cr_components/managed_footnote/managed_footnote.js"
-             type="chrome_html"
-             compress="gzip" />
+             type="chrome_html" />
 </grit-part>
diff --git a/chromium/ui/webui/resources/cr_components/cr_components_resources_v3.grdp b/chromium/ui/webui/resources/cr_components/cr_components_resources_v3.grdp
index b4bdcad48fc..96b5ae7929a 100644
--- a/chromium/ui/webui/resources/cr_components/cr_components_resources_v3.grdp
+++ b/chromium/ui/webui/resources/cr_components/cr_components_resources_v3.grdp
@@ -4,82 +4,71 @@
          file="${root_gen_dir}/ui/webui/resources/cr_components/managed_footnote/managed_footnote.m.js"
          use_base_dir="false"
          type="BINDATA"
-         preprocess="true"
-         compress="gzip" />
+         preprocess="true" />
   <include name="IDR_WEBUI_CR_COMPONENTS_OMNIBOX_CR_AUTOCOMPLETE_MATCH_LIST_JS"
          file="${root_gen_dir}/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.js"
          use_base_dir="false"
-         type="BINDATA"
-         compress="gzip" />
+         type="BINDATA" />
   <if expr="chromeos">
     <include name="IDR_WEBUI_CHROMEOS_SMB_SHARES_ADD_SMB_SHARE_DIALOG_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.m.js"
            use_base_dir="false"
-           type="BINDATA"
-           compress="gzip" />
+           type="BINDATA" />
     <include name="IDR_WEBUI_CHROMEOS_SMB_SHARES_SMB_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/smb_shares/smb_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
-           compress="gzip" />
+           type="BINDATA" />
+    <include name="IDR_WEBUI_CHROMEOS_BLUETOOTH_BLUETOOTH_DIALOG_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_dialog.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   </if>
   <if expr="use_nss_certs">
     <include name="IDR_WEBUI_CA_TRUST_EDIT_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/ca_trust_edit_dialog.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_delete_confirmation_dialog.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_MANAGER_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_manager.js"
              use_base_dir="false"
              preprocess="true"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_password_encryption_dialog.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_password_decryption_dialog.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATES_ERROR_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificates_error_dialog.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_ENTRY_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_entry.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_LIST_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_list.js"
              use_base_dir="false"
              preprocess="true"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_MANAGER_TYPES_JS"
              file="cr_components/certificate_manager/certificate_manager_types.js"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_SHARED_CSS_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_shared_css.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <include name="IDR_WEBUI_CERTIFICATE_SUBENTRY_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_subentry.js"
              use_base_dir="false"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
     <!-- TODO(https://crbug.com/1071641): When conditional imports are possible
          in cr_components, only include the certificate provisioning items for
          ChromeOS platforms. -->
@@ -87,28 +76,23 @@
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_provisioning_list.js"
              use_base_dir="false"
              type="BINDATA"
-             preprocess="true"
-             compress="gzip" />
+             preprocess="true" />
     <include name="IDR_WEBUI_CERTIFICATE_PROVISIONING_ENTRY_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_provisioning_entry.js"
              use_base_dir="false"
              type="BINDATA"
-             preprocess="true"
-             compress="gzip" />
+             preprocess="true" />
     <include name="IDR_WEBUI_CERTIFICATE_PROVISIONING_DETAILS_DIALOG_JS"
              file="${root_gen_dir}/ui/webui/resources/cr_components/certificate_manager/certificate_provisioning_details_dialog.js"
              use_base_dir="false"
              type="BINDATA"
-             preprocess="true"
-             compress="gzip" />
+             preprocess="true" />
     <include name="IDR_WEBUI_CERTIFICATE_PROVISIONING_BROWSER_PROXY"
              file="cr_components/certificate_manager/certificate_provisioning_browser_proxy.js"
              type="BINDATA"
-             preprocess="true"
-             compress="gzip" />
+             preprocess="true" />
     <include name="IDR_WEBUI_CERTIFICATES_BROWSER_PROXY_JS"
              file="cr_components/certificate_manager/certificates_browser_proxy.js"
-             type="BINDATA"
-             compress="gzip" />
+             type="BINDATA" />
   </if>
 </grit-part>
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-12 14:27:29 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-13 09:35:20 +0000
commit	c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree	e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/webui/resources/cr_components
parent	7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
download	qtwebengine-chromium-85-based.tar.gz