Fix CrSettingsMetricsReportingTest.All

Replace the settings-privacy-page element with a
settings-personalization-options element.
(The code for the metrics reporting was moved to
settings-personalization-options as part of
UnifiedConsent.)

Bug: 960259
Change-Id: I919248f4078bbca438611fc0e64da907fe86ef2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1604269
Auto-Submit: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658525}

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

@@ -2059,8 +2059,7 @@ CrSettingsMetricsReportingTest.prototype = {
   ]),
 };
 
-// TODO(crbug.com/960259): Broken with UnifiedConsent.
-TEST_F('CrSettingsMetricsReportingTest', 'DISABLED_All', function() {
+TEST_F('CrSettingsMetricsReportingTest', 'All', function() {
   mocha.run();
 });
 

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

@@ -13,7 +13,7 @@ suite('metrics reporting', function() {
     testBrowserProxy = new TestPrivacyPageBrowserProxy();
     settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy;
     PolymerTest.clearBody();
-    page = document.createElement('settings-privacy-page');
+    page = document.createElement('settings-personalization-options');
     document.body.appendChild(page);
   });
 
@@ -28,8 +28,7 @@ suite('metrics reporting', function() {
           return PolymerTest.flushTasks();
         })
         .then(function() {
-          const control = page.$$('settings-personalization-options')
-                              .$.metricsReportingControl;
+          const control = page.$.metricsReportingControl;
           assertEquals(
               testBrowserProxy.metricsReporting.enabled, control.checked);
           assertEquals(
@@ -62,7 +61,7 @@ suite('metrics reporting', function() {
       Polymer.dom.flush();
 
       // Restart button should be hidden by default (in any state).
-      assertFalse(!!page.$$('settings-personalization-options').$$('#restart'));
+      assertFalse(!!page.$$('#restart'));
 
       // Simulate toggling via policy.
       cr.webUIListenerCallback('metrics-reporting-change', {
@@ -71,7 +70,7 @@ suite('metrics reporting', function() {
       });
 
       // No restart button should show because the value is managed.
-      assertFalse(!!page.$$('settings-personalization-options').$$('#restart'));
+      assertFalse(!!page.$$('#restart'));
 
       cr.webUIListenerCallback('metrics-reporting-change', {
         enabled: true,
@@ -81,7 +80,7 @@ suite('metrics reporting', function() {
 
       // Changes in policy should not show the restart button because the value
       // is still managed.
-      assertFalse(!!page.$$('settings-personalization-options').$$('#restart'));
+      assertFalse(!!page.$$('#restart'));
 
       // Remove the policy and toggle the value.
       cr.webUIListenerCallback('metrics-reporting-change', {
@@ -91,7 +90,7 @@ suite('metrics reporting', function() {
       Polymer.dom.flush();
 
       // Now the restart button should be showing.
-      assertTrue(!!page.$$('settings-personalization-options').$$('#restart'));
+      assertTrue(!!page.$$('#restart'));
 
       // Receiving the same values should have no effect.
       cr.webUIListenerCallback('metrics-reporting-change', {
@@ -99,7 +98,7 @@ suite('metrics reporting', function() {
         managed: false,
       });
       Polymer.dom.flush();
-      assertTrue(!!page.$$('settings-personalization-options').$$('#restart'));
+      assertTrue(!!page.$$('#restart'));
     });
   });
 });