Stopping the history recording for a supervised user

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 "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::kContentPackDefaultFilteringBehavior,
-    prefs::kDefaultSupervisedUserFilteringBehavior,
-  },
-  {
-    supervised_users::kContentPackManualBehaviorHosts,
-    prefs::kSupervisedUserManualHosts,
-  },
-  {
-    supervised_users::kContentPackManualBehaviorURLs,
-    prefs::kSupervisedUserManualURLs,
-  },
-  {
-    supervised_users::kForceSafeSearch,
-    prefs::kForceSafeSearch,
-  },
-  {
-    supervised_users::kSigninAllowed,
-    prefs::kSigninAllowed,
-  },
-  {
-    supervised_users::kUserName,
-    prefs::kProfileName,
-  },
+    {

[Marc Treib, 2014/08/20 14:14:26]

Does the formatting change come from git cl format? Then maybe this is one of
the cases where it doesn't work correctly... the 1-space indent certainly
doesn't look right.

[fhorschig, 2014/08/20 14:48:03]

Indeed, it was. Changed it back.

+     supervised_users::kContentPackDefaultFilteringBehavior,
+     prefs::kDefaultSupervisedUserFilteringBehavior,
+    },
+    {
+     supervised_users::kContentPackManualBehaviorHosts,
+     prefs::kSupervisedUserManualHosts,
+    },
+    {
+     supervised_users::kContentPackManualBehaviorURLs,
+     prefs::kSupervisedUserManualURLs,
+    },
+    {
+     supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
+    },
+    {
+     supervised_users::kRecordHistory, prefs::kRecordHistory,
+    },
+    {
+     supervised_users::kSigninAllowed, prefs::kSigninAllowed,
+    },
+    {
+     supervised_users::kUserName, prefs::kProfileName,
+    },
 };
 
 }  // namespace
 
 SupervisedUserPrefStore::SupervisedUserPrefStore(
     SupervisedUserSettingsService* supervised_user_settings_service)
     : weak_ptr_factory_(this) {
   supervised_user_settings_service->Subscribe(
       base::Bind(&SupervisedUserPrefStore::OnNewSettingsAvailable,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 28 matching lines @@
     const base::DictionaryValue* settings) {
   scoped_ptr<PrefValueMap> old_prefs = prefs_.Pass();
   prefs_.reset(new PrefValueMap);
   if (settings) {
     // Set hardcoded prefs.
     prefs_->SetValue(prefs::kAllowDeletingBrowserHistory,
                      new FundamentalValue(false));
     prefs_->SetValue(prefs::kDefaultSupervisedUserFilteringBehavior,
                      new FundamentalValue(SupervisedUserURLFilter::ALLOW));
     prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true));
+    prefs_->SetValue(prefs::kRecordHistory, new FundamentalValue(true));
     prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true));
     prefs_->SetValue(prefs::kIncognitoModeAvailability,
                      new FundamentalValue(IncognitoModePrefs::DISABLED));
     prefs_->SetValue(prefs::kSigninAllowed, new FundamentalValue(false));
 
     // Copy supervised user settings to prefs.
     for (size_t i = 0; i < arraysize(kSupervisedUserSettingsPrefMapping); ++i) {
       const SupervisedUserSettingsPrefMappingEntry& entry =
           kSupervisedUserSettingsPrefMapping[i];
       const base::Value* value = NULL;
@@ skipping 10 matching lines @@
   std::vector<std::string> changed_prefs;
   prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
 
   // Send out change notifications.
   for (std::vector<std::string>::const_iterator pref(changed_prefs.begin());
        pref != changed_prefs.end();
        ++pref) {
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(*pref));
   }
 }