Apply individual policies for the various parts of device status reports.

chrome/browser/policy/device_policy_cache.cc

Index: chrome/browser/policy/device_policy_cache.cc
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc
index 7424a376b483acd1d816a93430e9e367b8f34571..1a4ea9327fd5ad5b96b502f0ff98b5a7bd713af3 100644
--- a/chrome/browser/policy/device_policy_cache.cc
+++ b/chrome/browser/policy/device_policy_cache.cc
@@ -368,24 +368,6 @@ void DevicePolicyCache::DecodeDevicePolicy(
                   POLICY_SCOPE_MACHINE,
                   Value::CreateStringValue(config));
   }
-
-  if (policy.has_device_reporting()) {
-    if (policy.device_reporting().has_report_version_info()) {
-      bool enabled = policy.device_reporting().report_version_info();
-      policies->Set(key::kReportDeviceVersionInfo,
-                    POLICY_LEVEL_MANDATORY,
-                    POLICY_SCOPE_MACHINE,
-                    Value::CreateBooleanValue(enabled));
-    }
-    if (policy.device_reporting().has_report_activity_times()) {
-      bool enabled = policy.device_reporting().report_activity_times();
-      policies->Set(key::kReportDeviceActivityTimes,
-                    POLICY_LEVEL_MANDATORY,
-                    POLICY_SCOPE_MACHINE,
-                    Value::CreateBooleanValue(enabled));
-    }
-  }
-
 }
 
 }  // namespace policy