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

chrome/browser/chromeos/stub_cros_settings_provider.cc

 // Copyright (c) 2011 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/stub_cros_settings_provider.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* kHandledSettings[] = {
   kAccountsPrefAllowGuest,
   kAccountsPrefAllowNewUser,
   kAccountsPrefShowUserNamesOnSignIn,
   kAccountsPrefUsers,
   kDeviceOwner,
   kReleaseChannel,
+  kReportDeviceVersionInfo,
+  kReportDeviceActivityTimes,
+  kReportDeviceBootMode,
   kSettingProxyEverywhere,
   kSignedDataRoamingEnabled,
   kStatsReportingPref
 };
 
 }  // namespace
 
 StubCrosSettingsProvider::StubCrosSettingsProvider(
     const NotifyObserversCallback& notify_cb)
     : CrosSettingsProvider(notify_cb) {
   SetDefaults();
 }
 
+StubCrosSettingsProvider::StubCrosSettingsProvider()
+  : CrosSettingsProvider(CrosSettingsProvider::NotifyObserversCallback()) {
+  SetDefaults();
+}
+
 StubCrosSettingsProvider::~StubCrosSettingsProvider() {
 }
 
 const base::Value* StubCrosSettingsProvider::Get(
     const std::string& path) const {
   DCHECK(HandlesSetting(path));
   const base::Value* value;
   if (values_.GetValue(path, &value))
     return value;
   return NULL;
@@ skipping 17 matching lines @@
                                      const base::Value& value) {
   values_.SetValue(path, value.DeepCopy());
   NotifyObservers(path);
 }
 
 void StubCrosSettingsProvider::SetDefaults() {
   values_.SetBoolean(kAccountsPrefAllowGuest, true);
   values_.SetBoolean(kAccountsPrefAllowNewUser, true);
   values_.SetBoolean(kAccountsPrefShowUserNamesOnSignIn, true);
   // |kDeviceOwner| will be set to the logged-in user by |UserManager|.
+
+  values_.SetBoolean(kReportDeviceVersionInfo, false);

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

Are you sure you need those defaults here. In a real world scenario the policy
fields will not be set until the admin changes them on the server. I don't mind
having those here but you should be sure to work correctly if those are actually
not present in the policy blob.

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

No, you're right. Done.

+  values_.SetBoolean(kReportDeviceActivityTimes, false);
+  values_.SetBoolean(kReportDeviceBootMode, false);
 }
 
 }  // namespace chromeos