Supervised users: if history recording is off, allow incognito and deleting history

chrome/browser/supervised_user/supervised_user_pref_store.cc

 // Copyright 2014 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/supervised_user/supervised_user_pref_store.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #include "chrome/common/pref_names.h"
 
 using base::FundamentalValue;
 
 namespace {
 
 struct SupervisedUserSettingsPrefMappingEntry {
   const char* settings_name;
   const char* pref_name;
 };
 
 SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
   {
+      supervised_users::kAllowDeletingBrowserHistory,
+      prefs::kAllowDeletingBrowserHistory,
+  },
+  {
     supervised_users::kContentPackDefaultFilteringBehavior,
     prefs::kDefaultSupervisedUserFilteringBehavior,
   },
   {
     supervised_users::kContentPackManualBehaviorHosts,
     prefs::kSupervisedUserManualHosts,
   },
   {
     supervised_users::kContentPackManualBehaviorURLs,
     prefs::kSupervisedUserManualURLs,
   },
   {
     supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
   },
   {
+      supervised_users::kIncognitoModeAvailability,
+      prefs::kIncognitoModeAvailability,
+  },
+  {
     supervised_users::kRecordHistory, prefs::kRecordHistory,
   },
   {
     supervised_users::kSigninAllowed, prefs::kSigninAllowed,
   },
   {
     supervised_users::kUserName, prefs::kProfileName,
   },
 };
 
@@ skipping 65 matching lines @@
   }
 
   std::vector<std::string> changed_prefs;
   prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
 
   // Send out change notifications.
   for (const std::string& pref : changed_prefs) {
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(pref));
   }
 }