Revert "Settings: Try re-enabling SiteList test"

This reverts commit 4252f96c.

Reason for revert: Still flaking on linux-chromeos-chrome
https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-chrome/4159

Original change's description:
> Settings: Try re-enabling SiteList test
> 
> Polymer 3 migration CL at:
> https://chromium-review.googlesource.com/c/chromium/src/+/2109410
> fixed a few issues in these tests. Try re-enabling them to see if they
> are still flaky on all platforms with the updates.
> 
> Bug: 929455
> Change-Id: I1efce24ce8b7c504379d43aa6ece5cb17896318d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2112241
> Reviewed-by: dpapad <dpapad@chromium.org>
> Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#752238}

TBR=dpapad@chromium.org,rbpotter@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 929455
Change-Id: If714becda68b234d121e809f29c18016673d943a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2113593Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752352}

chrome/test/data/webui/settings/cr_settings_browsertest.js

@@ -1548,7 +1548,8 @@ CrSettingsSiteListTest.prototype = {
   ]),
 };
 
-TEST_F('CrSettingsSiteListTest', 'SiteList', function() {
+// TODO(crbug.com/929455): flaky, fix.
+TEST_F('CrSettingsSiteListTest', 'DISABLED_SiteList', function() {
   runMochaSuite('SiteList');
 });
 
@@ -1584,7 +1585,8 @@ CrSettingsSiteListChromeOSTest.prototype = {
   ]),
 };
 
-TEST_F('CrSettingsSiteListChromeOSTest', 'AndroidSmsInfo', function() {
+// TODO(crbug.com/929455): flaky, fix.
+TEST_F('CrSettingsSiteListChromeOSTest', 'DISABLED_AndroidSmsInfo', function() {
   mocha.run();
 });
 GEN('#endif  // defined(OS_CHROMEOS)');

chrome/test/data/webui/settings/cr_settings_v3_browsertest.js

@@ -685,7 +685,9 @@ var CrSettingsSiteListV3Test = class extends CrSettingsV3BrowserTest {
   }
 };
 
-TEST_F('CrSettingsSiteListV3Test', 'SiteList', function() {
+// Copied from Polymer 2 test:
+// TODO(crbug.com/929455): flaky, fix.
+TEST_F('CrSettingsSiteListV3Test', 'DISABLED_SiteList', function() {
   runMochaSuite('SiteList');
 });
 
@@ -706,9 +708,12 @@ var CrSettingsSiteListChromeOSV3Test = class extends CrSettingsV3BrowserTest {
   }
 };
 
-TEST_F('CrSettingsSiteListChromeOSV3Test', 'AndroidSmsInfo', function() {
-  mocha.run();
-});
+// Copied from Polymer 2 test:
+// TODO(crbug.com/929455): flaky, fix.
+TEST_F(
+    'CrSettingsSiteListChromeOSV3Test', 'DISABLED_AndroidSmsInfo', function() {
+      mocha.run();
+    });
 GEN('#endif  // defined(OS_CHROMEOS)');
 
 // eslint-disable-next-line no-var

chrome/test/data/webui/settings/site_list_tests.js

@@ -286,12 +286,10 @@ suite('SiteList', function() {
 
   suiteSetup(function() {
     // clang-format off
-    /* #ignore */ if (customElements.get('settings-prefs') === undefined) {
-      /* #ignore */ return PolymerTest.importHtml(
-        /* #ignore */ 'chrome://settings/prefs/prefs_types.html')
-      /* #ignore */ .then(() => CrSettingsPrefs.setInitialized());
-    /* #ignore */ }
-    CrSettingsPrefs.setInitialized();
+    /* #ignore */ PolymerTest.importHtml(
+        /* #ignore */ 'chrome://settings/prefs/prefs_types.html').then(() => {
+          CrSettingsPrefs.setInitialized();
+        /* #ignore */ });
     // clang-format on
   });