Fix incorrect Polymer 3 assertion imports

This CL corrects the import of the assert function into site_data.js,
as well as removes the import of the unused assert.html from controlled_
button.js

Bug: 1069380
Change-Id: I5d50438763c355ca847567da1a9c6dfbfefcccb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2143815
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757966}

chrome/browser/resources/settings/controls/BUILD.gn

@@ -29,7 +29,6 @@ js_library("controlled_button") {
   deps = [
     ":pref_control_behavior",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior",
-    "//ui/webui/resources/js:assert",
   ]
 }
 
@@ -150,7 +149,6 @@ js_library("controlled_button.m") {
     ":pref_control_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior.m",
-    "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":controlled_button_module" ]
 }

chrome/browser/resources/settings/controls/controlled_button.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
-<link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">

chrome/browser/resources/settings/site_settings/BUILD.gn

@@ -490,6 +490,7 @@ js_library("site_data.m") {
     ":site_settings_behavior.m",
     "..:global_scroll_target_behavior.m",
     "..:route.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
     "//ui/webui/resources/js:assert.m",
@@ -606,7 +607,7 @@ js_library("site_list_entry.m") {
     "..:route.m",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
   extra_deps = [ ":site_list_entry_module" ]
@@ -800,6 +801,7 @@ polymer_modulizer("site_data") {
                    "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
                    "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
                    "chrome/browser/resources/settings/site_settings/site_data_entry.html|CookieDataSummaryItem",
+                   "ui/webui/resources/html/assert.html|assert"
                  ]
   namespace_rewrites = settings_namespace_rewrites
 }
@@ -847,7 +849,7 @@ polymer_modulizer("site_details_permission") {
                    "chrome/browser/resources/settings/route.html|routes",
                    "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes,SiteSettingSource",
                    "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|RawSiteException",
-                   "ui/webui/resources/html/assert.html|assert",
+                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
                  ]
   namespace_rewrites = settings_namespace_rewrites
 }