Split apart flaky CrSettingsPrivacyPageTest into multiple subtests

Bug: 877109
Change-Id: I8131723663b31439f3c809e433eb59716f25df33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1936462
Commit-Queue: Dan Beam <dbeam@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719456}

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

@@ -1161,12 +1161,41 @@ CrSettingsPrivacyPageTest.prototype = {
     'privacy_page_test.js',
   ]),
 };
-// Disabling on all platforms due to flakiness.
-// https://crbug.com/877109
-TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_All', function() {
+
+TEST_F('CrSettingsPrivacyPageTest', 'ClearBrowsingDataTests', function() {
+  settings_privacy_page.registerClearBrowsingDataTests();
+  mocha.run();
+});
+
+TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageTests', function() {
+  settings_privacy_page.registerPrivacyPageTests();
+  mocha.run();
+});
+
+TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageSoundTests', function() {
+  settings_privacy_page.registerPrivacyPageSoundTests();
+  mocha.run();
+});
+
+TEST_F('CrSettingsPrivacyPageTest', 'UMALoggingTests', function() {
+  settings_privacy_page.registerUMALoggingTests();
   mocha.run();
 });
 
+GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');
+TEST_F('CrSettingsPrivacyPageTest', 'CertificateManagerTests', function() {
+  settings_privacy_page.registerNativeCertificateManagerTests();
+  mocha.run();
+});
+GEN('#endif');
+
+GEN('#if !defined(OS_CHROMEOS)');
+TEST_F('CrSettingsPrivacyPageTest', 'ClearBrowsingDataTestsDice', function() {
+  settings_privacy_page.registerClearBrowsingDataTestsDice();
+  mocha.run();
+});
+GEN('#endif');
+
 /**
  * @constructor
  * @extends {CrSettingsBrowserTest}

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

@@ -164,6 +164,7 @@ cr.define('settings_privacy_page', function() {
   }
 
   function registerNativeCertificateManagerTests() {
+    assert(cr.isMac || cr.isWindows);
     suite('NativeCertificateManager', function() {
       /** @type {settings.TestPrivacyPageBrowserProxy} */
       let testBrowserProxy;
@@ -196,6 +197,12 @@ cr.define('settings_privacy_page', function() {
       let page;
 
       setup(function() {
+        const testBrowserProxy = new TestPrivacyPageBrowserProxy();
+        settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy;
+        const testSyncBrowserProxy = new TestSyncBrowserProxy();
+        settings.SyncBrowserProxyImpl.instance_ = testSyncBrowserProxy;
+        PolymerTest.clearBody();
+
         page = document.createElement('settings-privacy-page');
         page.prefs = {
           signin: {
@@ -204,6 +211,7 @@ cr.define('settings_privacy_page', function() {
           },
         };
         document.body.appendChild(page);
+        return testSyncBrowserProxy.whenCalled('getSyncStatus');
       });
 
       teardown(function() {
@@ -316,6 +324,7 @@ cr.define('settings_privacy_page', function() {
   }
 
   function registerClearBrowsingDataTestsDice() {
+    assert(!cr.isChromeOS);
     suite('ClearBrowsingDataDice', function() {
       /** @type {settings.TestClearBrowsingDataBrowserProxy} */
       let testBrowserProxy;
@@ -809,16 +818,12 @@ cr.define('settings_privacy_page', function() {
     });
   }
 
-  if (cr.isMac || cr.isWindows) {
-    registerNativeCertificateManagerTests();
-  }
-
-  if (!cr.isChromeOS) {
-    registerClearBrowsingDataTestsDice();
-  }
-
-  registerClearBrowsingDataTests();
-  registerPrivacyPageTests();
-  registerPrivacyPageSoundTests();
-  registerUMALoggingTests();
+  return {
+    registerNativeCertificateManagerTests,
+    registerClearBrowsingDataTestsDice,
+    registerClearBrowsingDataTests,
+    registerPrivacyPageTests,
+    registerPrivacyPageSoundTests,
+    registerUMALoggingTests,
+  };
 });