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

chrome/browser/supervised_user/supervised_user_settings_service.h

Index: chrome/browser/supervised_user/supervised_user_settings_service.h
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h
index 31be839993de1d6ca4170fb068e68ec9add2ce7a..780a71f29fe054370a7e114f10c1e43949393369 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.h
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
@@ -101,8 +101,8 @@ class SupervisedUserSettingsService : public KeyedService,
   void UploadItem(const std::string& key, scoped_ptr<base::Value> value);
 
   // Sets the setting with the given |key| to a copy of the given |value|.
-  void SetLocalSettingForTesting(const std::string& key,
-                                 scoped_ptr<base::Value> value);
+  void SetLocalSetting(const std::string& key,
+                       scoped_ptr<base::Value> value);
 
   // Public for testing.
   static syncer::SyncData CreateSyncDataForSetting(const std::string& name,