Delete kSettingsPolymer3 flag

The flag is no longer respected. Delete the flag and all references to
it.

Bug: 1069258
Change-Id: I0d5040eef178ab5d93cd45d244374f17a424f264
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2150277
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759822}

chrome/browser/ui/ui_features.cc

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

chrome/browser/ui/ui_features.h

@@ -52,8 +52,6 @@ extern const base::Feature kWebUITabStrip;
 
 extern const base::Feature kWebUITabStripDemoOptions;
 
-extern const base::Feature kSettingsPolymer3;
-
 extern const base::Feature kSyncSetupFriendlySettings;
 
 #if defined(OS_CHROMEOS)

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

@@ -61,10 +61,8 @@ var CrComponentsCertificateManagerV3Test =
   /** @override */
   get featureList() {
     return {
-      enabled: [
-        'network::features::kOutOfBlinkCors',
-        'features::kSettingsPolymer3',
-      ]
+      enabled: ['network::features::kOutOfBlinkCors'],
+      disabled: [],
     };
   }
 };

chrome/test/data/webui/cr_elements/cr_elements_v3_browsertest.js

@@ -320,10 +320,8 @@ var CrElementsPolicyPrefIndicatorV3Test =
   /** @override */
   get featureList() {
     return {
-      enabled: [
-        'network::features::kOutOfBlinkCors',
-        'features::kSettingsPolymer3',
-      ]
+      enabled: ['network::features::kOutOfBlinkCors'],
+      disabled: [],
     };
   }
 };

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

@@ -10,7 +10,6 @@ GEN_INCLUDE([
   '//chrome/test/data/webui/polymer_browser_test_base.js',
 ]);
 
-GEN('#include "chrome/browser/ui/ui_features.h"');
 GEN('#include "services/network/public/cpp/features.h"');
 
 /**
@@ -79,10 +78,7 @@ SettingsAccessibilityV3Test.prototype = {
 
   /** @override */
   featureList: {
-    enabled: [
-      'network::features::kOutOfBlinkCors',
-      'features::kSettingsPolymer3',
-    ],
+    enabled: ['network::features::kOutOfBlinkCors'],
     disabled: [],
   },
 

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

@@ -8,7 +8,6 @@
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 
 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/password_manager/core/common/password_manager_features.h"');
@@ -35,7 +34,6 @@ var CrSettingsV3BrowserTest = class extends PolymerTest {
     return {
       enabled: [
         'network::features::kOutOfBlinkCors',
-        'features::kSettingsPolymer3',
         ...(this.featureListInternal.enabled || []),
       ],
       disabled: this.featureListInternal.disabled || [],

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

@@ -7,8 +7,6 @@
 // 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 shared Polymer 3 elements. */
 // eslint-disable-next-line no-var
 var CrSettingsV3InteractiveUITest = class extends PolymerInteractiveUITest {
@@ -24,11 +22,6 @@ var CrSettingsV3InteractiveUITest = class extends PolymerInteractiveUITest {
       '//chrome/test/data/webui/mocha_adapter.js',
     ];
   }
-
-  /** @override */
-  get featureList() {
-    return {enabled: ['features::kSettingsPolymer3'], disabled: []};
-  }
 };
 
 // eslint-disable-next-line no-var

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

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN('#include "chrome/browser/ui/ui_features.h"');
 GEN('#include "services/network/public/cpp/features.h"');
 
 /**
@@ -30,10 +29,7 @@ SettingsIdleLoadV3BrowserTest.prototype = {
   /** @override */
   get featureList() {
     return {
-      enabled: [
-        'network::features::kOutOfBlinkCors',
-        'features::kSettingsPolymer3',
-      ],
+      enabled: ['network::features::kOutOfBlinkCors'],
       disabled: [],
     };
   },