chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc - Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1)

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/managed_mode/supervised_user_pref_mapping_service_unittest.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 6 months 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

« no previous file with comments | « chrome/browser/managed_mode/supervised_user_pref_mapping_service.cc ('k') | chrome/browser/managed_mode/supervised_user_pref_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc

diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc

index 7909ca3e102439db6b3c123311e7ddbe862b94f7..88e836f414e0d8e0b625c7c5e5724780fc46d9ed 100644

--- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc

+++ b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc

@@ -14,12 +14,13 @@

#include "chrome/test/base/testing_profile.h"

#include "testing/gtest/include/gtest/gtest.h"

-const char kFakeManagedUserId[] = "fakeID";

+const char kFakeSupervisedUserId[] = "fakeID";

class SupervisedUserPrefMappingServiceTest : public ::testing::Test {

protected:

SupervisedUserPrefMappingServiceTest() {

- profile_.GetPrefs()->SetString(prefs::kManagedUserId, kFakeManagedUserId);

+ profile_.GetPrefs()->SetString(prefs::kSupervisedUserId,

+ kFakeSupervisedUserId);

shared_settings_service_ =

ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(

&profile_);

@@ -46,11 +47,11 @@ class SupervisedUserPrefMappingServiceTest : public ::testing::Test {

TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) {

EXPECT_TRUE(shared_settings_service_->GetValue(

- kFakeManagedUserId, managed_users::kChromeAvatarIndex) ==

+ kFakeSupervisedUserId, managed_users::kChromeAvatarIndex) ==

NULL);

profile_.GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, 4);

const base::Value* value = shared_settings_service_->GetValue(

- kFakeManagedUserId, managed_users::kChromeAvatarIndex);

+ kFakeSupervisedUserId, managed_users::kChromeAvatarIndex);

int avatar_index;

value->GetAsInteger(&avatar_index);

EXPECT_EQ(avatar_index, 4);

@@ -58,10 +59,10 @@ TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) {

TEST_F(SupervisedUserPrefMappingServiceTest, CheckSharedSettingUpdate) {

EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), -1);

- shared_settings_service_->SetValue(kFakeManagedUserId,

+ shared_settings_service_->SetValue(kFakeSupervisedUserId,

managed_users::kChromeAvatarIndex,

base::FundamentalValue(1));

- mapping_service_->OnSharedSettingChanged(kFakeManagedUserId,

+ mapping_service_->OnSharedSettingChanged(kFakeSupervisedUserId,

managed_users::kChromeAvatarIndex);

EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), 1);

}