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

chrome/browser/supervised_user/supervised_user_resource_throttle_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 "chrome/browser/supervised_user/supervised_user_resource_throttle.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 37 matching lines @@
   command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
 }
 
 // Tests that showing the blocking interstitial for a WebContents without a
 // SupervisedUserNavigationObserver doesn't crash.
 IN_PROC_BROWSER_TEST_F(SupervisedUserResourceThrottleTest,
                        NoNavigationObserverBlock) {
   Profile* profile = browser()->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)));
 
   scoped_ptr<WebContents> web_contents(
       WebContents::Create(WebContents::CreateParams(profile)));
   NavigationController& controller = web_contents->GetController();
   content::TestNavigationObserver observer(web_contents.get());
   controller.LoadURL(GURL("http://www.example.com"), content::Referrer(),
                      ui::PAGE_TRANSITION_TYPED, std::string());
   observer.Wait();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType());
 }