Settings: Enable SettingsPolymer3 by default.

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

chrome/browser/ui/ui_features.cc

@@ -93,7 +93,7 @@ const base::Feature kWebUITabStripDemoOptions{
 // Makes chrome://settings serve the Polymer 3 version of that page.
 // https://crbug.com/1026426.
 const base::Feature kSettingsPolymer3{"SettingsPolymer3",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables friendly settings for the |chrome://settings/syncSetup| page.
 // https://crbug.com/1035421.

chrome/test/data/webui/cr_components/cr_components_browsertest.js

@@ -7,6 +7,8 @@
 // Polymer BrowserTest fixture.
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 
+GEN('#include "chrome/browser/ui/ui_features.h"');
+
 /**
  * Test fixture for shared Polymer components.
  * @constructor
@@ -118,6 +120,9 @@ CrComponentsCertificateManagerTest.prototype = {
    */
   browsePreload: 'chrome://settings/privacy_page/privacy_page.html',
 
+  /** @override */
+  featureList: {disabled: ['features::kSettingsPolymer3']},
+
   /** @override */
   extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
     '../test_util.js',

chrome/test/data/webui/settings/a11y/settings_accessibility_test.js

@@ -10,6 +10,8 @@ GEN_INCLUDE([
   '//chrome/test/data/webui/polymer_browser_test_base.js',
 ]);
 
+GEN('#include "chrome/browser/ui/ui_features.h"');
+
 /**
  * Test fixture for Accessibility of Chrome Settings.
  * @constructor
@@ -81,6 +83,9 @@ SettingsAccessibilityTest.prototype = {
     '../ensure_lazy_loaded.js',
   ],
 
+  /** @override */
+  featureList: {disabled: ['features::kSettingsPolymer3']},
+
   setUp: function() {
     PolymerTest.prototype.setUp.call(this);
     settings.ensureLazyLoaded();

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

@@ -12,6 +12,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
 GEN('#endif  // defined(OS_CHROMEOS)');
 
 GEN('#include "build/branding_buildflags.h"');
+GEN('#include "chrome/browser/ui/ui_features.h"');
 GEN('#include "chrome/common/chrome_features.h"');
 GEN('#include "components/autofill/core/common/autofill_features.h"');
 GEN('#include "components/omnibox/common/omnibox_features.h"');
@@ -38,6 +39,22 @@ CrSettingsBrowserTest.prototype = {
     'ensure_lazy_loaded.js',
   ],
 
+  /** @override */
+  get featureList() {
+    return {
+      enabled: this.featureListInternal.enabled || [],
+      disabled: [
+        'features::kSettingsPolymer3',
+        ...(this.featureListInternal.disabled || []),
+      ],
+    };
+  },
+
+  /** @return {!{enabled: !Array<string>, disabled: !Array<string>}} */
+  get featureListInternal() {
+    return {enabled: [], disabled: []};
+  },
+
   /** @override */
   setUp: function() {
     PolymerTest.prototype.setUp.call(this);
@@ -298,7 +315,9 @@ CrSettingsAutofillSectionCompanyEnabledTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/autofill_page/autofill_section.html',
 
-  featureList: {enabled: ['autofill::features::kAutofillEnableCompanyName']},
+  /** @override */
+  featureListInternal:
+      {enabled: ['autofill::features::kAutofillEnableCompanyName']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -324,7 +343,9 @@ CrSettingsAutofillSectionCompanyDisabledTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/autofill_page/autofill_section.html',
 
-  featureList: {disabled: ['autofill::features::kAutofillEnableCompanyName']},
+  /** @override */
+  featureListInternal:
+      {disabled: ['autofill::features::kAutofillEnableCompanyName']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -356,7 +377,9 @@ CrSettingsPasswordsSectionTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/autofill_page/passwords_section.html',
 
-  featureList: {enabled: ['password_manager::features::kPasswordCheck']},
+  /** @override */
+  featureListInternal:
+      {enabled: ['password_manager::features::kPasswordCheck']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -389,7 +412,9 @@ CrSettingsPasswordsCheckTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/autofill_page/password_check.html',
 
-  featureList: {enabled: ['password_manager::features::kPasswordCheck']},
+  /** @override */
+  featureListInternal:
+      {enabled: ['password_manager::features::kPasswordCheck']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -517,7 +542,8 @@ CrSettingsPeoplePageTest.prototype = {
   // length-checked in this test. The feature is defaulted on here during
   // rollout, reflecting its value in fieldtrial_testing_config.json.
   // See crbug.com/908435.
-  featureList: {enabled: ['omnibox::kDocumentProvider']},
+  /** @override */
+  featureListInternal: {enabled: ['omnibox::kDocumentProvider']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -640,7 +666,8 @@ CrSettingsPeoplePageSyncPageTest.prototype = {
   // length-checked in this test. The feature is defaulted on here during
   // rollout, reflecting its value in fieldtrial_testing_config.json.
   // See crbug.com/908435.
-  featureList: {enabled: ['omnibox::kDocumentProvider']},
+  /** @override */
+  featureListInternal: {enabled: ['omnibox::kDocumentProvider']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -1079,7 +1106,8 @@ CrSettingsPrivacyPageRedesignTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/privacy_page/privacy_page.html',
 
-  featureList: {enabled: ['features::kPrivacySettingsRedesign']},
+  /** @override */
+  featureListInternal: {enabled: ['features::kPrivacySettingsRedesign']},
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
@@ -1153,11 +1181,12 @@ CrSettingsSafetyCheckPageTest.prototype = {
   /** @override */
   browsePreload: 'chrome://settings/safety_check_page/safety_check_page.html',
 
-  featureList: {
+  /** @override */
+  featureListInternal: {
     enabled: [
       'features::kPrivacySettingsRedesign',
-      'password_manager::features::kPasswordCheck'
-    ]
+      'password_manager::features::kPasswordCheck',
+    ],
   },
 
   /** @override */

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

@@ -7,6 +7,8 @@
 // Polymer BrowserTest fixture.
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_interactive_ui_test.js']);
 
+GEN('#include "chrome/browser/ui/ui_features.h"');
+
 /**
  * Test fixture for interactive Polymer Settings elements.
  * @constructor
@@ -28,6 +30,11 @@ CrSettingsInteractiveUITest.prototype = {
     'ensure_lazy_loaded.js',
   ],
 
+  /** @override */
+  get featureList() {
+    return {disabled: ['features::kSettingsPolymer3']};
+  },
+
   /** @override */
   setUp: function() {
     PolymerInteractiveUITest.prototype.setUp.call(this);

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

@@ -36,10 +36,16 @@ var CrSettingsV3BrowserTest = class extends PolymerTest {
       enabled: [
         'network::features::kOutOfBlinkCors',
         'features::kSettingsPolymer3',
+        ...(this.featureListInternal.enabled || []),
       ],
-      disabled: [],
+      disabled: this.featureListInternal.disabled || [],
     };
   }
+
+  /** @return {!{enabled: !Array<string>, disabled: !Array<string>}} */
+  get featureListInternal() {
+    return {enabled: [], disabled: []};
+  }
 };
 
 // eslint-disable-next-line no-var
@@ -142,10 +148,10 @@ var CrSettingsAutofillSectionCompanyEnabledV3Test =
   }
 
   /** @override */
-  get featureList() {
-    const list = super.featureList;
-    list.enabled.push('autofill::features::kAutofillEnableCompanyName');
-    return list;
+  get featureListInternal() {
+    return {
+      enabled: ['autofill::features::kAutofillEnableCompanyName'],
+    };
   }
 };
 
@@ -166,10 +172,8 @@ var CrSettingsAutofillSectionCompanyDisabledV3Test =
   }
 
   /** @override */
-  get featureList() {
-    const list = super.featureList;
-    list.disabled.push('autofill::features::kAutofillEnableCompanyName');
-    return list;
+  get featureListInternal() {
+    return {disabled: ['autofill::features::kAutofillEnableCompanyName']};
   }
 };
 
@@ -187,11 +191,10 @@ var CrSettingsPasswordsSectionV3Test = class extends CrSettingsV3BrowserTest {
   get browsePreload() {
     return 'chrome://settings/test_loader.html?module=settings/passwords_section_test.m.js';
   }
+
   /** @override */
-  get featureList() {
-    const list = super.featureList;
-    list.enabled.push('password_manager::features::kPasswordCheck');
-    return list;
+  get featureListInternal() {
+    return {enabled: ['password_manager::features::kPasswordCheck']};
   }
 };
 
@@ -207,10 +210,8 @@ var CrSettingsPasswordsCheckV3Test = class extends CrSettingsV3BrowserTest {
   }
 
   /** @override */
-  get featureList() {
-    const list = super.featureList;
-    list.enabled.push('password_manager::features::kPasswordCheck');
-    return list;
+  get featureListInternal() {
+    return {enabled: ['password_manager::features::kPasswordCheck']};
   }
 };
 
@@ -226,11 +227,13 @@ var CrSettingsSafetyCheckPageV3Test = class extends CrSettingsV3BrowserTest {
   }
 
   /** @override */
-  get featureList() {
-    const list = super.featureList;
-    list.enabled.push('features::kPrivacySettingsRedesign');
-    list.enabled.push('password_manager::features::kPasswordCheck');
-    return list;
+  get featureListInternal() {
+    return {
+      enabled: [
+        'features::kPrivacySettingsRedesign',
+        'password_manager::features::kPasswordCheck',
+      ],
+    };
   }
 };
 
@@ -348,10 +351,9 @@ var CrSettingsPrivacyPageRedesignV3Test =
     return 'chrome://settings/test_loader.html?module=settings/privacy_page_test.m.js';
   }
 
-  get featureList() {
-    const list = super.featureList;
-    list.enabled.push('features::kPrivacySettingsRedesign');
-    return list;
+  /** @override */
+  get featureListInternal() {
+    return {enabled: ['features::kPrivacySettingsRedesign']};
   }
 };
 

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

@@ -7,6 +7,8 @@
 // Polymer BrowserTest fixture.
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 
+GEN('#include "chrome/browser/ui/ui_features.h"');
+
 /**
  * @constructor
  * @extends {PolymerTest}
@@ -19,6 +21,9 @@ SettingsHelpPageBrowserTest.prototype = {
   /** @override */
   browsePreload: 'chrome://help/',
 
+  /** @override */
+  featureList: {disabled: ['features::kSettingsPolymer3']},
+
   /** @override */
   extraLibraries: [
     ...PolymerTest.prototype.extraLibraries,

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

@@ -4,6 +4,7 @@
 
 /** @fileoverview Tests for settings-idle-load. */
 
+GEN('#include "chrome/browser/ui/ui_features.h"');
 
 /**
  * @constructor
@@ -24,6 +25,11 @@ SettingsIdleLoadBrowserTest.prototype = {
     'idle_load_tests.js',
   ],
 
+  /** @override */
+  get featureList() {
+    return {disabled: ['features::kSettingsPolymer3']};
+  },
+
   /** @override */
   isAsync: true,
 };