| 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 b659c8bdcce4fd3faf19b6b78331907950108ea5..0035a97d933c53fde22cde7b7381cbf6cd3954b8 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| @@ -55,9 +55,12 @@
|
| #include "chrome/browser/managed_mode/supervised_user_pref_store.h"
|
| #endif
|
|
|
| -#if defined(OS_WIN) && defined(ENABLE_RLZ)
|
| +#if defined(OS_WIN)
|
| +#include "base/win/win_util.h"
|
| +#if defined(ENABLE_RLZ)
|
| #include "rlz/lib/machine_id.h"
|
| -#endif
|
| +#endif // defined(ENABLE_RLZ)
|
| +#endif // defined(OS_WIN)
|
|
|
| using content::BrowserContext;
|
| using content::BrowserThread;
|
| @@ -158,6 +161,18 @@ enum SettingsEnforcementGroup {
|
| };
|
|
|
| SettingsEnforcementGroup GetSettingsEnforcementGroup() {
|
| +# if defined(OS_WIN)
|
| + static bool first_call = true;
|
| + static const bool is_enrolled_to_domain = base::win::IsEnrolledToDomain();
|
| + if (first_call) {
|
| + UMA_HISTOGRAM_BOOLEAN("Settings.TrackedPreferencesNoEnforcementOnDomain",
|
| + is_enrolled_to_domain);
|
| + first_call = false;
|
| + }
|
| + if (is_enrolled_to_domain)
|
| + return GROUP_NO_ENFORCEMENT;
|
| +#endif
|
| +
|
| struct {
|
| const char* group_name;
|
| SettingsEnforcementGroup group;
|
|
|