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

chrome/browser/supervised_user/supervised_user_service_browsertest.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/callback.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 98 matching lines @@
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
   std::string original_name = prefs->GetString(prefs::kProfileName);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
 
   SupervisedUserSettingsService* settings =
       SupervisedUserSettingsServiceFactory::GetForProfile(profile);
 
   std::string name = "Supervised User Test Name";
-  settings->SetLocalSettingForTesting(
+  settings->SetLocalSetting(
       supervised_users::kUserName,
       scoped_ptr<base::Value>(new base::StringValue(name)));
   EXPECT_FALSE(prefs->IsUserModifiablePreference(prefs::kProfileName));
   EXPECT_EQ(name, prefs->GetString(prefs::kProfileName));
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(name,
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 
   // Change the name once more.
   std::string new_name = "New Supervised User Test Name";
-  settings->SetLocalSettingForTesting(
+  settings->SetLocalSetting(
       supervised_users::kUserName,
       scoped_ptr<base::Value>(new base::StringValue(new_name)));
   EXPECT_EQ(new_name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(new_name,
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 
   // Remove the setting.
-  settings->SetLocalSettingForTesting(supervised_users::kUserName,
+  settings->SetLocalSetting(supervised_users::kUserName,
                                       scoped_ptr<base::Value>());
   EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(original_name,
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 }