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

chrome/browser/chromeos/device_settings_provider.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/chromeos/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 23 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 const char* kBooleanSettings[] = {
   kAccountsPrefAllowNewUser,
   kAccountsPrefAllowGuest,
   kAccountsPrefShowUserNamesOnSignIn,
   kSignedDataRoamingEnabled,
-  kStatsReportingPref
+  kStatsReportingPref,
+  kReportDeviceVersionInfo,
+  kReportDeviceActivityTimes,
+  kReportDeviceBootMode
 };
 
 const char* kStringSettings[] = {
   kDeviceOwner,
   kReleaseChannel,
   kSettingProxyEverywhere
 };
 
 const char* kListSettings[] = {
   kAccountsPrefUsers
@@ skipping 218 matching lines @@
   } else if (prop == kAccountsPrefUsers) {
     em::UserWhitelistProto* whitelist_proto = pol.mutable_user_whitelist();
     whitelist_proto->clear_user_whitelist();
     base::ListValue& users = static_cast<base::ListValue&>(*value);
     for (base::ListValue::const_iterator i = users.begin();
          i != users.end(); ++i) {
       std::string email;
       if ((*i)->GetAsString(&email))
         whitelist_proto->add_user_whitelist(email.c_str());
     }
   } else {

[pastarmovj, 2012/01/27 15:39:03]

Please put a TODO here at least that those three policies are missing for now in
the NOTREACHED clause if we ever try to set them this should help the person
debugging why it doesn't work know what's wrong.

[Patrick Dubroy, 2012/01/27 16:18:12]

Done.

     NOTREACHED();
   }
   data.set_policy_value(pol.SerializeAsString());
   // Set the cache to the updated value.
   policy_ = data;
   UpdateValuesCache();
 
   if (!signed_settings_cache::Store(data, g_browser_process->local_state()))
     LOG(ERROR) << "Couldn't store to the temp storage.";
 
@@ skipping 102 matching lines @@
   base::ListValue* list = new base::ListValue();
   const em::UserWhitelistProto& whitelist_proto = pol.user_whitelist();
   const RepeatedPtrField<std::string>& whitelist =
       whitelist_proto.user_whitelist();
   for (RepeatedPtrField<std::string>::const_iterator it = whitelist.begin();
        it != whitelist.end(); ++it) {
     list->Append(base::Value::CreateStringValue(*it));
   }
   new_values_cache.SetValue(kAccountsPrefUsers, list);
 
+  if (pol.has_device_reporting()) {
+    if (pol.device_reporting().has_report_version_info()) {
+      new_values_cache.SetBoolean(kReportDeviceVersionInfo,
+          pol.device_reporting().report_version_info());
+    }
+    if (pol.device_reporting().has_report_activity_times()) {
+      new_values_cache.SetBoolean(kReportDeviceActivityTimes,
+          pol.device_reporting().report_activity_times());
+    }
+    if (pol.device_reporting().has_report_boot_mode()) {
+      new_values_cache.SetBoolean(kReportDeviceBootMode,
+          pol.device_reporting().report_boot_mode());
+    }
+  }
+
   // Collect all notifications but send them only after we have swapped the
   // cache so that if somebody actually reads the cache will be already valid.
   std::vector<std::string> notifications;
   // Go through the new values and verify in the old ones.
   PrefValueMap::iterator iter = new_values_cache.begin();
   for (; iter != new_values_cache.end(); ++iter) {
     const base::Value* old_value;
     if (!values_cache_.GetValue(iter->first, &old_value) ||
         !old_value->Equals(iter->second)) {
       notifications.push_back(iter->first);
@@ skipping 191 matching lines @@
         Reload();
         return;
       }
       LOG(ERROR) << "No retries left";
       break;
     }
   }
 }
 
 }  // namespace chromeos