Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Unified Diff: chrome/test/base/testing_profile.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/test/base/testing_profile.h ('k') | chrome/test/base/testing_profile_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 0204523ae5f46daf790b39d8e50023337ef224f6..04c63ab38b677afdc32f8e95fdb35441e0ca780d 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -246,7 +246,7 @@ TestingProfile::TestingProfile(
scoped_ptr<PrefServiceSyncable> prefs,
bool incognito,
bool guest_session,
- const std::string& managed_user_id,
+ const std::string& supervised_user_id,
scoped_ptr<policy::PolicyService> policy_service,
const TestingFactories& factories)
: start_time_(Time::Now()),
@@ -256,7 +256,7 @@ TestingProfile::TestingProfile(
force_incognito_(false),
original_profile_(NULL),
guest_session_(guest_session),
- managed_user_id_(managed_user_id),
+ supervised_user_id_(supervised_user_id),
last_session_exited_cleanly_(true),
extension_special_storage_policy_(extension_policy),
profile_path_(path),
@@ -637,8 +637,8 @@ Profile* TestingProfile::GetOriginalProfile() {
return this;
}
-bool TestingProfile::IsManaged() {
- return !managed_user_id_.empty();
+bool TestingProfile::IsSupervised() {
+ return !supervised_user_id_.empty();
}
ExtensionService* TestingProfile::GetExtensionService() {
@@ -959,9 +959,9 @@ void TestingProfile::Builder::SetGuestSession() {
guest_session_ = true;
}
-void TestingProfile::Builder::SetManagedUserId(
- const std::string& managed_user_id) {
- managed_user_id_ = managed_user_id;
+void TestingProfile::Builder::SetSupervisedUserId(
+ const std::string& supervised_user_id) {
+ supervised_user_id_ = supervised_user_id;
}
void TestingProfile::Builder::SetPolicyService(
@@ -986,7 +986,7 @@ scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
pref_service_.Pass(),
incognito_,
guest_session_,
- managed_user_id_,
+ supervised_user_id_,
policy_service_.Pass(),
testing_factories_));
}
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | chrome/test/base/testing_profile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698