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

chrome/browser/supervised_user/supervised_user_browsertest.cc

Index: chrome/browser/supervised_user/supervised_user_browsertest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 213e0b554e068b818aa462393dddcad509b99dcc..b890b455e99450ce97e6e548cf9be55ae9d47fe6 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -108,7 +108,7 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest {
         SupervisedUserServiceFactory::GetForProfile(profile);
     SupervisedUserSettingsService* supervised_user_settings_service =
         SupervisedUserSettingsServiceFactory::GetForProfile(profile);
-    supervised_user_settings_service->SetLocalSettingForTesting(
+    supervised_user_settings_service->SetLocalSetting(
         supervised_users::kContentPackDefaultFilteringBehavior,
         scoped_ptr<base::Value>(
             new base::FundamentalValue(SupervisedUserURLFilter::BLOCK)));
@@ -236,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
   SupervisedUserSettingsService* supervised_user_settings_service =
       SupervisedUserSettingsServiceFactory::GetForProfile(
           browser()->profile());
-  supervised_user_settings_service->SetLocalSettingForTesting(
+  supervised_user_settings_service->SetLocalSetting(
       supervised_users::kContentPackManualBehaviorHosts, dict.Pass());
   EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             filter->GetFilteringBehaviorForURL(allowed_url));
@@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, Unblock) {
   SupervisedUserSettingsService* supervised_user_settings_service =
       SupervisedUserSettingsServiceFactory::GetForProfile(
           browser()->profile());
-  supervised_user_settings_service->SetLocalSettingForTesting(
+  supervised_user_settings_service->SetLocalSetting(
       supervised_users::kContentPackManualBehaviorHosts, dict.Pass());
 
   scoped_refptr<SupervisedUserURLFilter> filter =