Index: chromeos/login/auth/cryptohome_authenticator.cc |
diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc |
index d00cf29f1aa14af10c3b2326b4ba179dd755a084..d98b308cdbe31e845cb0ed9190e5a8abb9a2312b 100644 |
--- a/chromeos/login/auth/cryptohome_authenticator.cc |
+++ b/chromeos/login/auth/cryptohome_authenticator.cc |
@@ -190,17 +190,17 @@ void OnGetKeyDataEx(AuthAttemptState* attempt, |
// Extract the key type and salt from |key_data|, if present. |
scoped_ptr<int64> type; |
scoped_ptr<std::string> salt; |
- for (ScopedVector<cryptohome::RetrievedKeyData::ProviderData>:: |
+ for (std::vector<cryptohome::ProviderDataEntry>:: |
const_iterator it = key_data_entry->provider_data.begin(); |
it != key_data_entry->provider_data.end(); ++it) { |
- if ((*it)->name == kKeyProviderDataTypeName) { |
- if ((*it)->number) |
- type.reset(new int64(*(*it)->number)); |
+ if (it->name == kKeyProviderDataTypeName) { |
+ if (it->has_number) |
+ type.reset(new int64(it->number)); |
else |
NOTREACHED(); |
- } else if ((*it)->name == kKeyProviderDataSaltName) { |
- if ((*it)->bytes) |
- salt.reset(new std::string(*(*it)->bytes)); |
+ } else if (it->name == kKeyProviderDataSaltName) { |
+ if (it->has_bytes) |
+ salt.reset(new std::string(it->bytes)); |
else |
NOTREACHED(); |
} |