chrome/browser/supervised_user/supervised_user_browsertest.cc - Issue 697693004: Supervised users: if history recording is off, allow incognito and deleting history

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/supervised_user_browsertest.cc

Issue 697693004: Supervised users: if history recording is off, allow incognito and deleting history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix browser_tests Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/history/history.js ('K') | « chrome/browser/resources/history/history.js ('k') | chrome/browser/supervised_user/supervised_user_constants.h » ('j') | chrome/browser/supervised_user/supervised_user_constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 =