chrome/browser/sync/test/integration/profile_sync_service_harness.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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/sync/test/integration/profile_sync_service_harness.cc

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

Patch Set: review comments (+ a few other cleanups) 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/sync/sessions/notification_service_sessions_router.cc ('k') | chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

index d9125c41d5ddd4d5e0177e8fad3299ebc0a71369..092df7ff18609490ed5cd065e806c4a6ccfe84d8 100644

--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -33,7 +33,7 @@

#include "sync/internal_api/public/util/sync_string_conversions.h"

#if defined(ENABLE_MANAGED_USERS)

-#include "chrome/browser/managed_mode/managed_user_constants.h"

+#include "chrome/browser/supervised_user/supervised_user_constants.h"

#endif

using syncer::sessions::SyncSessionSnapshot;

@@ -162,7 +162,7 @@ bool ProfileSyncServiceHarness::SetupSync(

#if defined(ENABLE_MANAGED_USERS)

std::string account_id = profile_->IsSupervised() ?

- managed_users::kManagedUserPseudoEmail : username_;

+ supervised_users::kSupervisedUserPseudoEmail : username_;

#else

std::string account_id = username_;

#endif