Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3839)

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc
index 7fcd6e86fc33f7b3e080d34528aeacecdfcecbb5..924b810b36e1b4f67d6cff12d7253623fdf371a3 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc
@@ -45,8 +45,9 @@ std::string CreateSalt() {
}
std::string BuildRawHMACKey() {
- scoped_ptr<crypto::SymmetricKey> key(crypto::SymmetricKey::GenerateRandomKey(
- crypto::SymmetricKey::AES, kHMACKeySizeInBits));
+ std::unique_ptr<crypto::SymmetricKey> key(
+ crypto::SymmetricKey::GenerateRandomKey(crypto::SymmetricKey::AES,
+ kHMACKeySizeInBits));
std::string raw_result, result;
key->GetRawKey(&raw_result);
base::Base64Encode(raw_result, &result);
@@ -58,7 +59,7 @@ base::DictionaryValue* LoadPasswordData(base::FilePath profile_dir) {
profile_dir.Append(kPasswordUpdateFile));
std::string error_message;
int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;
- scoped_ptr<base::Value> value =
+ std::unique_ptr<base::Value> value =
deserializer.Deserialize(&error_code, &error_message);
if (JSONFileValueDeserializer::JSON_NO_ERROR != error_code) {
LOG(ERROR) << "Could not deserialize password data, error = " << error_code

Powered by Google App Engine
This is Rietveld 408576698