Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chromeos/login/auth/extended_authenticator.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 "chromeos/login/auth/extended_authenticator.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chromeos/cryptohome/async_method_caller.h"
@@ skipping 71 matching lines @@
   RecordStartMarker("MountEx");
 
   std::string canonicalized = gaia::CanonicalizeEmail(user_id);
   cryptohome::Identification id(canonicalized);
   cryptohome::Authorization auth(keys.front());
   cryptohome::MountParameters mount(false);
   for (size_t i = 0; i < keys.size(); i++) {
     mount.create_keys.push_back(keys[i]);
   }
   UserContext context(user_id);
-  Key key(keys.front().key);
+  Key key(keys.front().secret);
   key.SetLabel(keys.front().label);
   context.SetKey(key);
 
   cryptohome::HomedirMethods::GetInstance()->MountEx(
       id,
       auth,
       mount,
       base::Bind(&ExtendedAuthenticator::OnMountComplete,
                  this,
                  "MountEx",
@@ skipping 249 matching lines @@
   if (consumer_)
     consumer_->OnAuthenticationFailure(state);
 
   if (old_consumer_) {
     AuthFailure failure(AuthFailure::UNLOCK_FAILED);
     old_consumer_->OnAuthFailure(failure);
   }
 }
 
 }  // namespace chromeos