Settings: Add type checking for site_list, site_settings_page tests.

Bug: 1000989 Change-Id: I5cd5b84e9296935951a4d65903e61fdbfaa2a4ea Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2190749 Commit-Queue: Rebekah Potter <rbpotter@chromium.org> Auto-Submit: dpapad <dpapad@chromium.org> Reviewed-by: Rebekah Potter <rbpotter@chromium.org> Cr-Commit-Position: refs/heads/master@{#767604}
Denger-Network · May 12, 2020 · a5ef4a8 · a5ef4a8
1 parent 880d26f
commit a5ef4a8
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 118 deletions.
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
@@ -241,9 +241,11 @@ js_library("hats_browser_proxy") {
 
 js_library("lazy_load") {
   deps = [
+    "privacy_page:cookies_page",
     "site_settings:local_data_browser_proxy",
     "site_settings:protocol_handlers",
     "site_settings:site_settings_prefs_browser_proxy",
+    "site_settings_page",
   ]
 }
 

diff --git a/chrome/browser/resources/settings/lazy_load.js b/chrome/browser/resources/settings/lazy_load.js
@@ -87,7 +87,7 @@ export {cookieInfo} from './site_settings/cookie_info.js';
 export {CookieList, LocalDataBrowserProxy, LocalDataBrowserProxyImpl, LocalDataItem} from './site_settings/local_data_browser_proxy.js';
 export {HandlerEntry, ProtocolEntry} from './site_settings/protocol_handlers.js';
 export {kControlledByLookup} from './site_settings/site_settings_behavior.js';
-export {ContentSettingProvider, CookieControlsManagedState, DefaultContentSetting, RawChooserException, RawSiteException, RecentSitePermissions, SiteGroup, SiteSettingsPrefsBrowserProxy, SiteSettingsPrefsBrowserProxyImpl, ZoomLevelEntry} from './site_settings/site_settings_prefs_browser_proxy.js';
+export {ContentSettingProvider, CookieControlsManagedState, DefaultContentSetting, RawChooserException, RawSiteException, RecentSitePermissions, SiteException, SiteGroup, SiteSettingsPrefsBrowserProxy, SiteSettingsPrefsBrowserProxyImpl, ZoomLevelEntry} from './site_settings/site_settings_prefs_browser_proxy.js';
 export {WebsiteUsageBrowserProxyImpl} from './site_settings/website_usage_browser_proxy.js';
 export {defaultSettingLabel} from './site_settings_page/site_settings_list.js';
 // <if expr="not chromeos">

diff --git a/chrome/browser/resources/settings/privacy_page/BUILD.gn b/chrome/browser/resources/settings/privacy_page/BUILD.gn
@@ -69,6 +69,7 @@ js_library("cookies_page") {
     "..:route",
     "..:router.m",
     "../prefs:prefs_behavior.m",
+    "../site_settings:site_list",
     "../site_settings:site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",

diff --git a/chrome/browser/resources/settings/site_settings/BUILD.gn b/chrome/browser/resources/settings/site_settings/BUILD.gn
@@ -132,6 +132,7 @@ js_library("edit_exception_dialog") {
     ":site_settings_prefs_browser_proxy",
     "//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",
   ]
 }
 
@@ -254,8 +255,10 @@ js_library("site_entry") {
 
 js_library("site_list") {
   deps = [
+    ":add_site_dialog",
     ":android_info_browser_proxy",
     ":constants",
+    ":edit_exception_dialog",
     ":site_list_entry",
     ":site_settings_behavior",
     ":site_settings_prefs_browser_proxy",

diff --git a/chrome/browser/resources/settings/site_settings/add_site_dialog.js b/chrome/browser/resources/settings/site_settings/add_site_dialog.js
@@ -42,7 +42,6 @@ Polymer({
      */
     contentSetting: String,
 
-    /** @private */
     hasIncognito: {
       type: Boolean,
       observer: 'hasIncognitoChanged_',

diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js
@@ -51,7 +51,6 @@ Polymer({
     /**
      * Some content types (like Location) do not allow the user to manually
      * edit the exception list from within Settings.
-     * @private
      */
     readOnlyList: {
       type: Boolean,

diff --git a/chrome/test/data/webui/BUILD.gn b/chrome/test/data/webui/BUILD.gn
@@ -338,13 +338,23 @@ group("closure_compile") {
 }
 
 js_type_check("closure_compile_local") {
-  uses_js_modules = true
+  is_polymer3 = true
   deps = [
     ":chai_assert",
     ":test_browser_proxy.m",
+    ":test_util.m",
   ]
 }
 
+js_library("test_util.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/test_util.m.js" ]
+  deps = [
+    ":chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+  extra_deps = [ ":modulize_local" ]
+}
+
 js_library("chai_assert") {
   externs_list = [ "//third_party/chaijs/externs/chai-3.5.js" ]
 }

diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn
@@ -63,6 +63,8 @@ js_type_check("closure_compile") {
     ":advanced_page_test",
     ":search_page_test",
     ":settings_page_test_util",
+    ":site_list_tests",
+    ":site_settings_page_test",
     ":test_about_page_browser_proxy",
     ":test_lifetime_browser_proxy.m",
     ":test_local_data_browser_proxy",
@@ -74,52 +76,64 @@ js_type_check("closure_compile") {
   ]
 }
 
-js_library("test_local_data_browser_proxy") {
+js_library("about_page_tests") {
   deps = [
-    "..:test_browser_proxy.m",
-    "//chrome/browser/resources/settings:lazy_load",
+    ":test_about_page_browser_proxy",
+    ":test_lifetime_browser_proxy.m",
+    "..:chai_assert",
+    "//chrome/browser/resources/settings:settings",
   ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("test_site_settings_prefs_browser_proxy") {
+js_library("advanced_page_test") {
   deps = [
-    ":test_util",
-    "..:test_browser_proxy.m",
-    "//chrome/browser/resources/settings:lazy_load",
+    ":settings_page_test_util",
+    "..:chai_assert",
+    "//chrome/browser/resources/settings:settings",
+    "//ui/webui/resources/js:load_time_data.m",
   ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("test_util") {
+js_library("search_page_test") {
   deps = [
-    "//chrome/browser/resources/settings:lazy_load",
+    ":test_search_engines_browser_proxy.m",
+    "..:chai_assert",
     "//chrome/browser/resources/settings:settings",
   ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("about_page_tests") {
+js_library("settings_page_test_util") {
+  deps = [ "..:chai_assert" ]
+}
+
+js_library("site_list_tests") {
   deps = [
-    ":test_about_page_browser_proxy",
-    ":test_lifetime_browser_proxy.m",
+    ":test_site_settings_prefs_browser_proxy",
+    ":test_util",
     "..:chai_assert",
-    "//chrome/browser/resources/settings:settings",
+    "..:test_util.m",
+    "//chrome/browser/resources/settings:lazy_load",
+    "//ui/webui/resources/js:cr.m",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("advanced_page_test") {
+js_library("site_settings_page_test") {
   deps = [
-    ":settings_page_test_util",
+    ":test_site_settings_prefs_browser_proxy",
+    ":test_util",
     "..:chai_assert",
-    "//chrome/browser/resources/settings:settings",
+    "//chrome/browser/resources/settings:lazy_load",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row.m",
+    "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("settings_page_test_util") {
-  deps = [ "..:chai_assert" ]
-}
-
 js_library("test_about_page_browser_proxy") {
   deps = [
     "..:test_browser_proxy.m",
@@ -138,6 +152,13 @@ js_library("test_lifetime_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
+js_library("test_local_data_browser_proxy") {
+  deps = [
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/settings:lazy_load",
+  ]
+}
+
 js_library("test_search_engines_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js" ]
   deps = [
@@ -147,11 +168,17 @@ js_library("test_search_engines_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("search_page_test") {
+js_library("test_site_settings_prefs_browser_proxy") {
   deps = [
-    ":test_search_engines_browser_proxy.m",
-    "..:chai_assert",
+    ":test_util",
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/settings:lazy_load",
+  ]
+}
+
+js_library("test_util") {
+  deps = [
+    "//chrome/browser/resources/settings:lazy_load",
     "//chrome/browser/resources/settings:settings",
   ]
-  externs_list = [ "$externs_path/mocha-2.5.js" ]
 }