Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc |
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
index 6c097adf3641a164e58deff2c6195d13bd440dfc..6de056730c9e951f2b7fffccb2ac9043f400b917 100644 |
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
@@ -126,9 +126,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
{ key::kDefaultPrinterSelection, |
prefs::kPrintPreviewDefaultDestinationSelectionRules, |
base::Value::TYPE_STRING }, |
- { key::kMetricsReportingEnabled, |
- metrics::prefs::kMetricsReportingEnabled, |
- base::Value::TYPE_BOOLEAN }, |
{ key::kApplicationLocaleValue, |
prefs::kApplicationLocale, |
base::Value::TYPE_STRING }, |
@@ -493,6 +490,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
base::Value::TYPE_BOOLEAN }, |
#endif // defined(OS_CHROMEOS) |
+// Metrics reporting is controlled by a platform specific policy for ChromeOS |
+#if defined(OS_CHROMEOS) |
+ { key::kDeviceMetricsReportingEnabled, |
+ metrics::prefs::kMetricsReportingEnabled, |
+ base::Value::TYPE_BOOLEAN }, |
+#else |
+ { key::kMetricsReportingEnabled, |
+ metrics::prefs::kMetricsReportingEnabled, |
+ base::Value::TYPE_BOOLEAN }, |
+#endif |
+ |
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
{ key::kBackgroundModeEnabled, |
prefs::kBackgroundModeEnabled, |