Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 309873002: Alter settings enforcement default to GROUP_NO_ENFORCEMENT in absence of Finch seed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update extension startup browser test, comment. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 390bfc7f67defb3fac489b7ccb6ecedc8b360138..6d868762a6aedf1bc9aa7e6c8ddfe36dcd0448a7 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -230,17 +230,12 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() {
GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE },
};
- // Use the strongest enforcement setting in the absence of a field trial
- // config on Windows. Remember to update the OFFICIAL_BUILD sections of
+ // Use the no enforcement setting in the absence of a field trial
+ // config. Remember to update the OFFICIAL_BUILD sections of
// pref_hash_browsertest.cc and extension_startup_browsertest.cc when updating
// the default value below.
- // TODO(gab): Enforce this on all platforms.
- SettingsEnforcementGroup enforcement_group =
-#if defined(OS_WIN)
- GROUP_ENFORCE_DEFAULT;
-#else
- GROUP_NO_ENFORCEMENT;
-#endif
+ // TODO(gab): Change this to the strongest enforcement on all platforms.
+ SettingsEnforcementGroup enforcement_group = GROUP_NO_ENFORCEMENT;
bool group_determined_from_trial = false;
base::FieldTrial* trial =
base::FieldTrialList::Find(

Powered by Google App Engine
This is Rietveld 408576698