chrome/browser/managed_mode/managed_user_sync_service_unittest.cc - Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace.

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/managed_user_sync_service_unittest.cc

Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years 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/managed_user_sync_service.cc ('k') | chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_user_sync_service_unittest.cc

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

index dce07de4095bd13a987fbaba20638833d3e3c0e9..ead1441e3dbf5fb09851da21278982c72f44792b 100644

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

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

@@ -181,11 +181,11 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {

const char kAvatar4[] = "";

{

DictionaryPrefUpdate update(prefs(), prefs::kManagedUsers);

- DictionaryValue* managed_users = update.Get();

- DictionaryValue* dict = new DictionaryValue;

+ base::DictionaryValue* managed_users = update.Get();

+ base::DictionaryValue* dict = new base::DictionaryValue;

dict->SetString(kNameKey, kName1);

managed_users->Set(kUserId1, dict);

- dict = new DictionaryValue;

+ dict = new base::DictionaryValue;

dict->SetString(kNameKey, kName2);

dict->SetBoolean(kAcknowledgedKey, true);

managed_users->Set(kUserId2, dict);

@@ -212,13 +212,13 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {

EXPECT_EQ(2, result.num_items_before_association());

EXPECT_EQ(4, result.num_items_after_association());

- const DictionaryValue* managed_users = service()->GetManagedUsers();

+ const base::DictionaryValue* managed_users = service()->GetManagedUsers();

EXPECT_EQ(4u, managed_users->size());

EXPECT_TRUE(async_managed_users);

EXPECT_TRUE(managed_users->Equals(async_managed_users));

{

- const DictionaryValue* managed_user = NULL;

+ const base::DictionaryValue* managed_user = NULL;

ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user));

ASSERT_TRUE(managed_user);

std::string name;

@@ -232,7 +232,7 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {

EXPECT_EQ(kAvatar2, avatar);

}

{

- const DictionaryValue* managed_user = NULL;

+ const base::DictionaryValue* managed_user = NULL;

ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user));

ASSERT_TRUE(managed_user);

std::string name;

@@ -246,7 +246,7 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {

EXPECT_EQ(kAvatar3, avatar);

}

{

- const DictionaryValue* managed_user = NULL;

+ const base::DictionaryValue* managed_user = NULL;

ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user));

ASSERT_TRUE(managed_user);

std::string name;