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

chrome/browser/supervised_user/supervised_user_settings_service_unittest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
@@ skipping 183 matching lines @@
   const base::DictionaryValue* dict_value = NULL;
   ASSERT_TRUE(value->GetAsDictionary(&dict_value));
   EXPECT_TRUE(dict_value->Equals(&dict));
 }
 
 TEST_F(SupervisedUserSettingsServiceTest, SetLocalSetting) {
   const base::Value* value = NULL;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
   settings_.reset();
-  settings_service_.SetLocalSettingForTesting(
+  settings_service_.SetLocalSetting(
       kSettingsName,
       scoped_ptr<base::Value>(new base::StringValue(kSettingsValue)));
   ASSERT_TRUE(settings_);
   ASSERT_TRUE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
   EXPECT_EQ(kSettingsValue, string_value);
 }
 
 TEST_F(SupervisedUserSettingsServiceTest, UploadItem) {
@@ skipping 65 matching lines @@
   // The uploaded items should not show up as settings.
   const base::Value* value = NULL;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));
 
   // Restarting sync should not create any new changes.
   settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);
   StartSyncing(sync_data);
   ASSERT_EQ(0u, sync_processor_->changes().size());
 }