Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chrome/browser/supervised_user/chromeos/manager_password_service.cc

 // Copyright 2014 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/supervised_user/chromeos/manager_password_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
@@ skipping 146 matching lines @@
         SupervisedUserAuthentication::PASSWORD_CHANGE_FAILED_NO_PASSWORD_DATA,
         SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
     return;
   }
 
   cryptohome::KeyDefinition new_key_definition(
       new_key,
       kCryptohomeSupervisedUserKeyLabel,
       cryptohome::PRIV_AUTHORIZED_UPDATE || cryptohome::PRIV_MOUNT);
   new_key_definition.revision = revision;
-
-  new_key_definition.encryption_key = encryption_key;
-  new_key_definition.signature_key = signature_key;
+  new_key_definition.authorization_data.push_back(
+      cryptohome::KeyDefinition::AuthorizationData(true /* encrypt */,
+                                                   false /* sign */,
+                                                   encryption_key));
+  new_key_definition.authorization_data.push_back(
+      cryptohome::KeyDefinition::AuthorizationData(false /* encrypt */,
+                                                   true /* sign */,
+                                                   signature_key));
 
   authenticator_->AddKey(manager_key,
                          new_key_definition,
                          true /* replace existing */,
                          base::Bind(&ManagerPasswordService::OnAddKeySuccess,
                                     weak_ptr_factory_.GetWeakPtr(),
                                     manager_key,
                                     user_id,
                                     Passed(&password_data)));
 }
@@ skipping 83 matching lines @@
 void ManagerPasswordService::OnOldManagerKeyDeleted(
     const UserContext& master_key_context) {
   VLOG(1) << "Removed old master key for " << master_key_context.GetUserID();
 }
 
 void ManagerPasswordService::Shutdown() {
   settings_service_subscription_.reset();
 }
 
 }  // namespace chromeos