Flip Finch Configs so we can harden DSE w/o extensions

chrome/browser/prefs/chrome_pref_service_factory.cc

Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 951726a800f6c579a017cec2c4f13c44ac07b1ac..dac7e80e7c9fc709ebf35f897b00f81a40787457 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -185,8 +185,8 @@ enum SettingsEnforcementGroup {
   GROUP_NO_ENFORCEMENT,
   // Enforce protected settings on profile loads.
   GROUP_ENFORCE_ALWAYS,
-  // Also enforce extension settings.
-  GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS,
+  // Also enforce extension default search.
+  GROUP_ENFORCE_ALWAYS_WITH_DSE,
   // Also enforce extension settings and default search.
   GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE,
   // The default enforcement group contains all protection features.
@@ -217,8 +217,8 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() {
     { chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways,
       GROUP_ENFORCE_ALWAYS },
     { chrome_prefs::internals::
-          kSettingsEnforcementGroupEnforceAlwaysWithExtensions,
-      GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS },
+          kSettingsEnforcementGroupEnforceAlwaysWithDSE,
+      GROUP_ENFORCE_ALWAYS_WITH_DSE },
     { chrome_prefs::internals::
           kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE,
       GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE },
@@ -267,7 +267,13 @@ GetTrackingConfiguration() {
       data.enforcement_level = PrefHashFilter::NO_ENFORCEMENT;
     }
 
-    if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS &&
+    if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_DSE &&
+        data.name == DefaultSearchManager::kDefaultSearchProviderDataPrefName) {
+      // Specifically enable default search settings enforcement.
+      data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
+    }
+
+    if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE &&
         (data.name == extensions::pref_names::kExtensions ||
          data.name == extensions::pref_names::kKnownDisabled)) {
       // Specifically enable extension settings enforcement and ensure
@@ -276,12 +282,6 @@ GetTrackingConfiguration() {
       data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
     }
 
-    if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE &&
-        data.name == DefaultSearchManager::kDefaultSearchProviderDataPrefName) {
-      // Specifically enable default search settings enforcement.
-      data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
-    }
-
     result.push_back(data);
   }
   return result;
@@ -391,8 +391,8 @@ namespace internals {
 const char kSettingsEnforcementTrialName[] = "SettingsEnforcement";
 const char kSettingsEnforcementGroupNoEnforcement[] = "no_enforcement";
 const char kSettingsEnforcementGroupEnforceAlways[] = "enforce_always";
-const char kSettingsEnforcementGroupEnforceAlwaysWithExtensions[] =
-    "enforce_always_with_extensions";
+const char kSettingsEnforcementGroupEnforceAlwaysWithDSE[] =
+    "enforce_always_with_dse";
 const char kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE[] =
     "enforce_always_with_extensions_and_dse";