Settings: Preparing remaining privacy_page/ tests for Polymer3.

Removing register*() wrapper functions, using runMochaSuite()
instead.

Bug: 1026426
Change-Id: I802eb09bb4640dc673c213dc53796a219ce71f99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2127417
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754705}

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

@@ -1037,26 +1037,22 @@ CrSettingsPrivacyPageTest.prototype = {
 };
 
 TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageTests', function() {
-  settings_privacy_page.registerPrivacyPageTests();
-  mocha.run();
+  runMochaSuite('PrivacyPage');
 });
 
 TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageRedesignTests', function() {
-  settings_privacy_page.registerPrivacyPageRedesignTests();
-  mocha.run();
+  runMochaSuite('PrivacyPageRedesignEnabled');
 });
 
 // TODO(crbug.com/1043665): flaky crash on Linux Tests (dbg).
 TEST_F(
     'CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPageSoundTests', function() {
-      settings_privacy_page.registerPrivacyPageSoundTests();
-      mocha.run();
+      runMochaSuite('PrivacyPageSound');
     });
 
 // TODO(sauski): Privacy page UMA changing, tests need updating/removal.
 TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_UMALoggingTests', function() {
-  settings_privacy_page.registerUMALoggingTests();
-  mocha.run();
+  runMochaSuite('PrivacyPageUMACheck');
 });
 
 GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');
@@ -1064,8 +1060,7 @@ GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');
 TEST_F(
     'CrSettingsPrivacyPageTest', 'DISABLED_CertificateManagerTests',
     function() {
-      settings_privacy_page.registerNativeCertificateManagerTests();
-      mocha.run();
+      runMochaSuite('NativeCertificateManager');
     });
 GEN('#endif');
 
@@ -1098,8 +1093,7 @@ CrSettingsPrivacyPageRedesignTest.prototype = {
 TEST_F(
     'CrSettingsPrivacyPageRedesignTest', 'HappinessTrackingSurveysTests',
     function() {
-      settings_privacy_page.registerHappinessTrackingSurveysTests();
-      mocha.run();
+      runMochaSuite('HappinessTrackingSurveys');
     });
 
 /**

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

@@ -2,10 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.define('settings_privacy_page', function() {
-
-  function registerUMALoggingTests() {
-    suite('PrivacyPageUMACheck', function() {
+suite('PrivacyPageUMACheck', function() {
   /** @type {settings.TestPrivacyPageBrowserProxy} */
   let testBrowserProxy;
 
@@ -52,8 +49,8 @@ cr.define('settings_privacy_page', function() {
 
   test('LogAllPrivacyPageClicks', async function() {
     page.$$('#manageCertificates').click();
-        let result = await testMetricsBrowserProxy.whenCalled(
-            'recordSettingsPageHistogram');
+    let result =
+        await testMetricsBrowserProxy.whenCalled('recordSettingsPageHistogram');
     assertEquals(
         settings.PrivacyElementInteractions.MANAGE_CERTIFICATES, result);
 
@@ -61,17 +58,16 @@ cr.define('settings_privacy_page', function() {
     testMetricsBrowserProxy.reset();
 
     page.$$('#canMakePaymentToggle').click();
-        result = await testMetricsBrowserProxy.whenCalled(
-            'recordSettingsPageHistogram');
-        assertEquals(
-            settings.PrivacyElementInteractions.PAYMENT_METHOD, result);
+    result =
+        await testMetricsBrowserProxy.whenCalled('recordSettingsPageHistogram');
+    assertEquals(settings.PrivacyElementInteractions.PAYMENT_METHOD, result);
 
     settings.Router.getInstance().navigateTo(settings.routes.PRIVACY);
     testMetricsBrowserProxy.reset();
 
     page.$$('#safeBrowsingToggle').click();
-        result = await testMetricsBrowserProxy.whenCalled(
-            'recordSettingsPageHistogram');
+    result =
+        await testMetricsBrowserProxy.whenCalled('recordSettingsPageHistogram');
     assertEquals(settings.PrivacyElementInteractions.SAFE_BROWSING, result);
   });
 
@@ -83,12 +79,9 @@ cr.define('settings_privacy_page', function() {
               settings.PrivacyElementInteractions.IMPROVE_SECURITY, result);
         });
   });
-    });
-  }
+});
 
-  function registerNativeCertificateManagerTests() {
-    assert(cr.isMac || cr.isWindows);
-    suite('NativeCertificateManager', function() {
+suite('NativeCertificateManager', function() {
   /** @type {settings.TestPrivacyPageBrowserProxy} */
   let testBrowserProxy;
 
@@ -96,6 +89,7 @@ cr.define('settings_privacy_page', function() {
   let page;
 
   suiteSetup(function() {
+    assertTrue(cr.isMac || cr.isWindows);
     loadTimeData.overrideValues({
       privacySettingsRedesignEnabled: false,
     });
@@ -117,11 +111,9 @@ cr.define('settings_privacy_page', function() {
     page.$$('#manageCertificates').click();
     return testBrowserProxy.whenCalled('showManageSSLCertificates');
   });
-    });
-  }
+});
 
-  function registerPrivacyPageTests() {
-    suite('PrivacyPage', function() {
+suite('PrivacyPage', function() {
   /** @type {SettingsPrivacyPageElement} */
   let page;
 
@@ -178,8 +170,7 @@ cr.define('settings_privacy_page', function() {
 
   test('safeBrowsingReportingToggle', function() {
     const safeBrowsingToggle = page.$$('#safeBrowsingToggle');
-        const safeBrowsingReportingToggle =
-            page.$$('#safeBrowsingReportingToggle');
+    const safeBrowsingReportingToggle = page.$$('#safeBrowsingReportingToggle');
     assertTrue(safeBrowsingToggle.checked);
     assertFalse(safeBrowsingReportingToggle.disabled);
     assertTrue(safeBrowsingReportingToggle.checked);
@@ -212,10 +203,8 @@ cr.define('settings_privacy_page', function() {
     page.$$('#moreExpansion').click();
 
     assertTrue(test_util.isChildVisible(page, '#safeBrowsingToggle'));
-        assertTrue(
-            test_util.isChildVisible(page, '#passwordsLeakDetectionToggle'));
-        assertTrue(
-            test_util.isChildVisible(page, '#safeBrowsingReportingToggle'));
+    assertTrue(test_util.isChildVisible(page, '#passwordsLeakDetectionToggle'));
+    assertTrue(test_util.isChildVisible(page, '#safeBrowsingReportingToggle'));
     assertTrue(test_util.isChildVisible(page, '#doNotTrack'));
     assertTrue(test_util.isChildVisible(page, '#canMakePaymentToggle'));
     if (loadTimeData.getBoolean('enableSecurityKeysSubpage')) {
@@ -223,11 +212,9 @@ cr.define('settings_privacy_page', function() {
           test_util.isChildVisible(page, '#security-keys-subpage-trigger'));
     }
   });
-    });
-  }
+});
 
-  function registerPrivacyPageRedesignTests() {
-    suite('PrivacyPageRedesignEnabled', function() {
+suite('PrivacyPageRedesignEnabled', function() {
   /** @type {SettingsPrivacyPageElement} */
   let page;
 
@@ -280,20 +267,16 @@ cr.define('settings_privacy_page', function() {
   });
 
   test('CookiesLinkRowSublabel', async function() {
-        await siteSettingsBrowserProxy.whenCalled(
-            'getCookieSettingDescription');
+    await siteSettingsBrowserProxy.whenCalled('getCookieSettingDescription');
     Polymer.dom.flush();
     assertEquals(page.$$('#cookiesLinkRow').subLabel, testLabels[0]);
 
-        cr.webUIListenerCallback(
-            'cookieSettingDescriptionChanged', testLabels[1]);
+    cr.webUIListenerCallback('cookieSettingDescriptionChanged', testLabels[1]);
     assertEquals(page.$$('#cookiesLinkRow').subLabel, testLabels[1]);
   });
-    });
-  }
+});
 
-  function registerPrivacyPageSoundTests() {
-    suite('PrivacyPageSound', function() {
+suite('PrivacyPageSound', function() {
   /** @type {settings.TestPrivacyPageBrowserProxy} */
   let testBrowserProxy;
 
@@ -342,8 +325,7 @@ cr.define('settings_privacy_page', function() {
     assertFalse(getToggleElement().hasAttribute('checked'));
 
     cr.webUIListenerCallback(
-            'onBlockAutoplayStatusChanged',
-            {pref: {value: true}, enabled: true});
+        'onBlockAutoplayStatusChanged', {pref: {value: true}, enabled: true});
 
     return flushAsync().then(() => {
       // Check that we are on and enabled.
@@ -375,8 +357,7 @@ cr.define('settings_privacy_page', function() {
   });
 
   test('Hidden', () => {
-        assertTrue(
-            loadTimeData.getBoolean('enableBlockAutoplayContentSetting'));
+    assertTrue(loadTimeData.getBoolean('enableBlockAutoplayContentSetting'));
     assertFalse(getToggleElement().hidden);
 
     loadTimeData.overrideValues({enableBlockAutoplayContentSetting: false});
@@ -386,8 +367,7 @@ cr.define('settings_privacy_page', function() {
     document.body.appendChild(page);
 
     return flushAsync().then(() => {
-          assertFalse(
-              loadTimeData.getBoolean('enableBlockAutoplayContentSetting'));
+      assertFalse(loadTimeData.getBoolean('enableBlockAutoplayContentSetting'));
       assertTrue(getToggleElement().hidden);
     });
   });
@@ -397,8 +377,7 @@ cr.define('settings_privacy_page', function() {
     assertFalse(getToggleElement().hasAttribute('checked'));
 
     cr.webUIListenerCallback(
-            'onBlockAutoplayStatusChanged',
-            {pref: {value: true}, enabled: true});
+        'onBlockAutoplayStatusChanged', {pref: {value: true}, enabled: true});
 
     return flushAsync().then(() => {
       // Check that we are on and enabled.
@@ -413,11 +392,9 @@ cr.define('settings_privacy_page', function() {
           });
     });
   });
-    });
-  }
+});
 
-  function registerHappinessTrackingSurveysTests() {
-    suite('HappinessTrackingSurveys', function() {
+suite('HappinessTrackingSurveys', function() {
   /** @type {settings.TestHatsBrowserProxy} */
   let testHatsBrowserProxy;
 
@@ -456,15 +433,4 @@ cr.define('settings_privacy_page', function() {
     page.$$('#permissionsLinkRow').click();
     return testHatsBrowserProxy.whenCalled('tryShowSurvey');
   });
-    });
-  }
-
-  return {
-    registerNativeCertificateManagerTests,
-    registerPrivacyPageTests,
-    registerPrivacyPageRedesignTests,
-    registerPrivacyPageSoundTests,
-    registerUMALoggingTests,
-    registerHappinessTrackingSurveysTests,
-  };
 });