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

chrome/browser/policy/device_policy_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/device_policy_cache.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 350 matching lines @@
 
   if (policy.has_open_network_configuration() &&
       policy.open_network_configuration().has_open_network_configuration()) {
     std::string config(
         policy.open_network_configuration().open_network_configuration());
     policies->Set(key::kDeviceOpenNetworkConfiguration,
                   POLICY_LEVEL_MANDATORY,
                   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