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

chrome/browser/supervised_user/supervised_user_settings_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 83 matching lines @@
                                          const std::string& key);
 
   // Uploads an item to the Sync server. Items are the same data structure as
   // supervised user settings (i.e. key-value pairs, as described at the top of
   // the file), but they are only uploaded (whereas supervised user settings are
   // only downloaded), and never passed to the preference system.
   // An example of an uploaded item is an access request to a blocked URL.
   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,
                                                    const base::Value& value);
 
   // KeyedService implementation:
   void Shutdown() override;
 
   // SyncableService implementation:
   syncer::SyncMergeResult MergeDataAndStartSyncing(
@@ skipping 42 matching lines @@
 
   std::vector<SettingsCallback> subscribers_;
 
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService);
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_