chrome/browser/supervised_user/supervised_user_service_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_service_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/supervised_user/supervised_user_constants.h ('K') | « chrome/browser/supervised_user/supervised_user_service.cc ('k') | chrome/browser/supervised_user/supervised_user_settings_service.h » ('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_service_browsertest.cc

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

index b8cd9cbf5e8bde245f1c6c61ba99aff098595475..30a41977ce65fe28ab9d940861551f2977251ab0 100644

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

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

@@ -116,7 +116,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, ProfileName) {

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));

@@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, ProfileName) {

// 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));

@@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, ProfileName) {

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());