Merge 252230 "Switch SettingsEnforcement default back to GROUP_N..."

> Switch SettingsEnforcement default back to GROUP_NO_ENFORCEMENT.
> 
> BUG=344936
> 
> Review URL: https://codereview.chromium.org/165733003

TBR=gab@chromium.org

Review URL: https://codereview.chromium.org/176813004

git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@252944 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 10 deletions

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 3c7f190..7041b31 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -190,6 +190,9 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() {
       GROUP_ENFORCE_ALWAYS },
   };
 
+  // TODO(gab): Switch the default to GROUP_ENFORCE_ALWAYS.
+  SettingsEnforcementGroup enforcement_group = GROUP_NO_ENFORCEMENT;
+  bool group_determined_from_trial = false;
   base::FieldTrial* trial =
       base::FieldTrialList::Find(
           chrome_prefs::internals::kSettingsEnforcementTrialName);
@@ -200,18 +203,16 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() {
     // non-array pointer types; this is fine since kEnforcementLevelMap is
     // clearly an array.
     for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEnforcementLevelMap); ++i) {
-      if (kEnforcementLevelMap[i].group_name == group_name)
-        return kEnforcementLevelMap[i].group;
+      if (kEnforcementLevelMap[i].group_name == group_name) {
+        enforcement_group = kEnforcementLevelMap[i].group;
+        group_determined_from_trial = true;
+        break;
+      }
     }
   }
-#if defined(OS_WIN)
-  // Default to GROUP_ENFORCE_ALWAYS in the absence of a valid value for the
-  // SettingsEnforcement field trial.
-  // TODO(gab): Switch other platforms over to this mode.
-  return GROUP_ENFORCE_ALWAYS;
-#else
-  return GROUP_NO_ENFORCEMENT;
-#endif
+  UMA_HISTOGRAM_BOOLEAN("Settings.EnforcementGroupDeterminedFromTrial",
+                        group_determined_from_trial);
+  return enforcement_group;
 }
 
 // Shows notifications which correspond to PersistentPrefStore's reading errors.
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 8495206..66cd44f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -17799,6 +17799,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Settings.EnforcementGroupDeterminedFromTrial"
+    enum="BooleanSuccess">
+  <summary>
+    Whether the SettingsEnforcement group was successfully determined from the
+    field trial or if it had to revert to the hardcoded default.
+  </summary>
+</histogram>
+
 <histogram name="Settings.FilterOnLoadTime" units="milliseconds">
   <summary>
     The amount of time it took to run PrefHashFilter::FilterOnLoad on startup.