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

chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

 // Copyright 2013 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/browser/chromeos/login/managed/supervised_user_login_flow.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 114 matching lines @@
     UMA_HISTOGRAM_ENUMERATION(
         "ManagedUsers.ChromeOS.PasswordChange",
         SupervisedUserAuthentication::PASSWORD_CHANGE_FAILED_INCOMPLETE_DATA,
         SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
     Finish();
     return;
   }
   base::Base64Decode(base64_signature, &signature);
   scoped_ptr<base::DictionaryValue> data_copy(password_data->DeepCopy());
   cryptohome::KeyDefinition key(password,
-                                kCryptohomeManagedUserKeyLabel,
-                                kCryptohomeManagedUserKeyPrivileges);
+                                kCryptohomeSupervisedUserKeyLabel,
+                                kCryptohomeSupervisedUserKeyPrivileges);
 
   authenticator_ = new ExtendedAuthenticator(this);
   SupervisedUserAuthentication::Schema current_schema =
       auth->GetPasswordSchema(user_id());
 
   key.revision = revision;
 
   if (SupervisedUserAuthentication::SCHEMA_PLAIN == current_schema) {
     // We need to add new key, and block old one. As we don't actually have
     // signature key, use Migrate privilege instead of AuthorizedUpdate.
-    key.privileges = kCryptohomeManagedUserIncompleteKeyPrivileges;
+    key.privileges = kCryptohomeSupervisedUserIncompleteKeyPrivileges;
 
     VLOG(1) << "Adding new schema key";
     DCHECK(context_.GetKey()->GetLabel().empty());
     authenticator_->AddKey(context_,
                            key,
                            false /* no key exists */,
                            base::Bind(&SupervisedUserLoginFlow::OnNewKeyAdded,
                                       weak_factory_.GetWeakPtr(),
                                       Passed(&data_copy)));
   } else if (SupervisedUserAuthentication::SCHEMA_SALT_HASHED ==
              current_schema) {
     VLOG(1) << "Updating the key";
 
     if (auth->HasIncompleteKey(user_id())) {
       // We need to use Migrate instead of Authorized Update privilege.
-      key.privileges = kCryptohomeManagedUserIncompleteKeyPrivileges;
+      key.privileges = kCryptohomeSupervisedUserIncompleteKeyPrivileges;
     }
     // Just update the key.
-    DCHECK_EQ(context_.GetKey()->GetLabel(), kCryptohomeManagedUserKeyLabel);
+    DCHECK_EQ(context_.GetKey()->GetLabel(), kCryptohomeSupervisedUserKeyLabel);
     authenticator_->UpdateKeyAuthorized(
         context_,
         key,
         signature,
         base::Bind(&SupervisedUserLoginFlow::OnPasswordUpdated,
                    weak_factory_.GetWeakPtr(),
                    Passed(&data_copy)));
   } else {
     NOTREACHED() << "Unsupported password schema";
   }
 }
 
 void SupervisedUserLoginFlow::OnNewKeyAdded(
     scoped_ptr<base::DictionaryValue> password_data) {
   VLOG(1) << "New key added";
   SupervisedUserAuthentication* auth =
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   auth->StorePasswordData(user_id(), *password_data.get());
   auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
   authenticator_->RemoveKey(
       context_,
-      kLegacyCryptohomeManagedUserKeyLabel,
+      kLegacyCryptohomeSupervisedUserKeyLabel,
       base::Bind(&SupervisedUserLoginFlow::OnOldKeyRemoved,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SupervisedUserLoginFlow::OnOldKeyRemoved() {
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",
       SupervisedUserAuthentication::PASSWORD_CHANGED_IN_USER_SESSION,
       SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
   Finish();
@@ skipping 51 matching lines @@
     Profile* profile) {
   profile_ = profile;
   UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
       profile,
       base::Bind(
            &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
            weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos