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 97313af949c6e5128f12ef5f5348c1809dd7fd7f..89bd025599c8c8dfe6df73885b823cd020114f6b 100644 |
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc |
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc |
@@ -204,8 +204,14 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() { |
}; |
// Use the strongest enforcement setting in the absence of a field trial |
- // config. |
- SettingsEnforcementGroup enforcement_group = GROUP_ENFORCE_DEFAULT; |
+ // config on Windows. |
+ // TODO(gab): Enforce this on all platforms. |
+ SettingsEnforcementGroup enforcement_group = |
+#if defined(OS_WIN) |
+ GROUP_ENFORCE_DEFAULT; |
+#else |
+ NO_ENFORCEMENT; |
robertshield
2014/04/09 23:26:21
GROUP_NO_ENFORCEMENT?
gab
2014/04/10 13:15:25
Duh, of course :). Done.
|
+#endif |
bool group_determined_from_trial = false; |
base::FieldTrial* trial = |
base::FieldTrialList::Find( |