chrome/browser/supervised_user/supervised_user_pref_store_unittest.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_pref_store_unittest.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/supervised_user/supervised_user_constants.h ('K') | « chrome/browser/supervised_user/supervised_user_pref_store.cc ('k') | chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc » ('j') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

index 7e80748a54c464bc81c645c4daf7bf888c498754..490b2261e3e46ea05fe12e34fca48cb85248d043 100644

--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

@@ -127,7 +127,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {

scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);

dict->SetBoolean("example.com", true);

dict->SetBoolean("moose.org", false);

- service_.SetLocalSettingForTesting(

+ service_.SetLocalSetting(

supervised_users::kContentPackManualBehaviorHosts,

scoped_ptr<base::Value>(dict->DeepCopy()));

EXPECT_EQ(1u, fixture.changed_prefs()->size());

@@ -138,7 +138,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {

// kForceSafeSearch can be configured by the custodian, overriding the

// hardcoded default.

fixture.changed_prefs()->Clear();

- service_.SetLocalSettingForTesting(

+ service_.SetLocalSetting(

supervised_users::kForceSafeSearch,

scoped_ptr<base::Value>(new base::FundamentalValue(false)));

EXPECT_EQ(1u, fixture.changed_prefs()->size());