Index: remoting/host/pairing_registry_delegate_win.cc |
diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc |
index af61d6df3fdc702ba46819af7bb6348dea4ac70b..abd9e647a64e124be91d766b1050e8ae457deb8f 100644 |
--- a/remoting/host/pairing_registry_delegate_win.cc |
+++ b/remoting/host/pairing_registry_delegate_win.cc |
@@ -68,7 +68,7 @@ std::unique_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key, |
return nullptr; |
} |
- return base::WrapUnique(static_cast<base::DictionaryValue*>(value.release())); |
+ return base::DictionaryValue::From(std::move(value)); |
} |
// Serializes |value| into a JSON string and writes it as value |value_name| |
@@ -139,7 +139,7 @@ std::unique_ptr<base::ListValue> PairingRegistryDelegateWin::LoadAll() { |
PairingRegistry::Pairing pairing = Load(base::WideToUTF8(value_name)); |
if (pairing.is_valid()) |
- pairings->Append(pairing.ToValue().release()); |
+ pairings->Append(pairing.ToValue()); |
} |
return pairings; |
@@ -221,7 +221,7 @@ bool PairingRegistryDelegateWin::Save(const PairingRegistry::Pairing& pairing) { |
CHECK(pairing_json->Remove(PairingRegistry::kSharedSecretKey, &secret_key)); |
std::unique_ptr<base::DictionaryValue> secret_json( |
new base::DictionaryValue()); |
- secret_json->Set(PairingRegistry::kSharedSecretKey, secret_key.release()); |
+ secret_json->Set(PairingRegistry::kSharedSecretKey, std::move(secret_key)); |
// presubmit: allow wstring |
std::wstring value_name = base::UTF8ToWide(pairing.client_id()); |