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

Unified Diff: net/test/spawned_test_server/base_test_server.cc

Issue 2899723003: Remove raw base::DictionaryValue::Set in //net (Closed)
Patch Set: Rebase Created 3 years, 7 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
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index 2f02922556fb60fce5538151cd65167744d32b59..ab46afb3c0c247bdad5f7651eb0ddd3a915f3535 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -580,7 +580,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
}
if (ssl_client_certs->GetSize())
- arguments->Set("ssl-client-ca", ssl_client_certs.release());
+ arguments->Set("ssl-client-ca", std::move(ssl_client_certs));
std::unique_ptr<base::ListValue> client_cert_types(new base::ListValue());
for (size_t i = 0; i < ssl_options_.client_cert_types.size(); i++) {
@@ -588,7 +588,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
GetClientCertType(ssl_options_.client_cert_types[i]));
}
if (client_cert_types->GetSize())
- arguments->Set("ssl-client-cert-type", client_cert_types.release());
+ arguments->Set("ssl-client-cert-type", std::move(client_cert_types));
}
if (type_ == TYPE_HTTPS) {
@@ -618,12 +618,12 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
std::unique_ptr<base::ListValue> key_exchange_values(new base::ListValue());
GetKeyExchangesList(ssl_options_.key_exchanges, key_exchange_values.get());
if (key_exchange_values->GetSize())
- arguments->Set("ssl-key-exchange", key_exchange_values.release());
+ arguments->Set("ssl-key-exchange", std::move(key_exchange_values));
// Check bulk cipher argument.
std::unique_ptr<base::ListValue> bulk_cipher_values(new base::ListValue());
GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get());
if (bulk_cipher_values->GetSize())
- arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
+ arguments->Set("ssl-bulk-cipher", std::move(bulk_cipher_values));
if (ssl_options_.record_resume)
arguments->Set("https-record-resume", base::MakeUnique<base::Value>());
if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698