Add a Key class

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"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/login/auth/key.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h"
 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 116 matching lines @@
       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;
 
     VLOG(1) << "Adding new schema key";
-    DCHECK(context_.GetKeyLabel().empty());
+    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;
     }
     // Just update the key.
-    DCHECK_EQ(context_.GetKeyLabel(), kCryptohomeManagedUserKeyLabel);
+    DCHECK_EQ(context_.GetKey()->GetLabel(), kCryptohomeManagedUserKeyLabel);
     authenticator_->UpdateKeyAuthorized(
         context_,
         key,
         signature,
         base::Bind(&SupervisedUserLoginFlow::OnPasswordUpdated,
                    weak_factory_.GetWeakPtr(),
                    Passed(&data_copy)));
   } else {
     NOTREACHED() << "Unsupported password schema";
   }
@@ skipping 73 matching lines @@
     Profile* profile) {
   profile_ = profile;
   UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
       profile,
       base::Bind(
            &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
            weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos