Rename "managed (mode|user)" to "supervised user" (part 1)

chrome/test/base/testing_profile.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 228 matching lines @@
   }
 }
 
 TestingProfile::TestingProfile(
     const base::FilePath& path,
     Delegate* delegate,
     scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy,
     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()),
       prefs_(prefs.release()),
       testing_prefs_(NULL),
       incognito_(incognito),
       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),
       browser_context_dependency_manager_(
           BrowserContextDependencyManager::GetInstance()),
       resource_context_(NULL),
       delegate_(delegate),
       policy_service_(policy_service.release()) {
   // If no profile path was supplied, create one.
   if (profile_path_.empty()) {
@@ skipping 360 matching lines @@
 bool TestingProfile::HasOffTheRecordProfile() {
   return incognito_profile_.get() != NULL;
 }
 
 Profile* TestingProfile::GetOriginalProfile() {
   if (original_profile_)
     return original_profile_;
   return this;
 }
 
-bool TestingProfile::IsManaged() {
-  return !managed_user_id_.empty();
+bool TestingProfile::IsSupervised() {
+  return !supervised_user_id_.empty();
 }
 
 ExtensionService* TestingProfile::GetExtensionService() {
   return extensions::ExtensionSystem::Get(this)->extension_service();
 }
 
 void TestingProfile::SetExtensionSpecialStoragePolicy(
     ExtensionSpecialStoragePolicy* extension_special_storage_policy) {
   extension_special_storage_policy_ = extension_special_storage_policy;
 }
@@ skipping 300 matching lines @@
 }
 
 void TestingProfile::Builder::SetIncognito() {
   incognito_ = true;
 }
 
 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(
     scoped_ptr<policy::PolicyService> policy_service) {
   policy_service_ = policy_service.Pass();
 }
 
 void TestingProfile::Builder::AddTestingFactory(
     BrowserContextKeyedServiceFactory* service_factory,
     BrowserContextKeyedServiceFactory::TestingFactoryFunction callback) {
   testing_factories_.push_back(std::make_pair(service_factory, callback));
 }
 
 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
   DCHECK(!build_called_);
   build_called_ = true;
 
   return scoped_ptr<TestingProfile>(new TestingProfile(
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass(),
       incognito_,
       guest_session_,
-      managed_user_id_,
+      supervised_user_id_,
       policy_service_.Pass(),
       testing_factories_));
 }