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 ecf5af5d636d867db615f986e133d4b1bf07c3a1..2ef7417b21add51d7cb18b520a3ec5adb9b33df0 100644 |
--- a/net/test/spawned_test_server/base_test_server.cc |
+++ b/net/test/spawned_test_server/base_test_server.cc |
@@ -114,8 +114,9 @@ bool GetLocalCertificatesDir(const base::FilePath& certificates_dir, |
return true; |
} |
-scoped_ptr<base::ListValue> GetTokenBindingParams(std::vector<int> params) { |
- scoped_ptr<base::ListValue> values(new base::ListValue()); |
+std::unique_ptr<base::ListValue> GetTokenBindingParams( |
+ std::vector<int> params) { |
+ std::unique_ptr<base::ListValue> values(new base::ListValue()); |
for (int param : params) { |
values->Append(new base::FundamentalValue(param)); |
} |
@@ -265,7 +266,8 @@ std::string BaseTestServer::GetScheme() const { |
bool BaseTestServer::GetAddressList(AddressList* address_list) const { |
DCHECK(address_list); |
- scoped_ptr<HostResolver> resolver(HostResolver::CreateDefaultResolver(NULL)); |
+ std::unique_ptr<HostResolver> resolver( |
+ HostResolver::CreateDefaultResolver(NULL)); |
HostResolver::RequestInfo info(host_port_pair_); |
// Limit the lookup to IPv4. When started with the default |
// address of kLocalhost, testserver.py only supports IPv4. |
@@ -406,7 +408,7 @@ void BaseTestServer::SetResourcePath(const base::FilePath& document_root, |
bool BaseTestServer::ParseServerData(const std::string& server_data) { |
VLOG(1) << "Server data: " << server_data; |
base::JSONReader json_reader; |
- scoped_ptr<base::Value> value(json_reader.ReadToValue(server_data)); |
+ std::unique_ptr<base::Value> value(json_reader.ReadToValue(server_data)); |
if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY)) { |
LOG(ERROR) << "Could not parse server data: " |
<< json_reader.GetErrorMessage(); |
@@ -490,7 +492,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const { |
// Check the client certificate related arguments. |
if (ssl_options_.request_client_certificate) |
arguments->Set("ssl-client-auth", base::Value::CreateNullValue()); |
- scoped_ptr<base::ListValue> ssl_client_certs(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> ssl_client_certs(new base::ListValue()); |
std::vector<base::FilePath>::const_iterator it; |
for (it = ssl_options_.client_authorities.begin(); |
@@ -506,7 +508,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const { |
if (ssl_client_certs->GetSize()) |
arguments->Set("ssl-client-ca", ssl_client_certs.release()); |
- scoped_ptr<base::ListValue> client_cert_types(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> client_cert_types(new base::ListValue()); |
for (size_t i = 0; i < ssl_options_.client_cert_types.size(); i++) { |
client_cert_types->Append(new base::StringValue( |
GetClientCertType(ssl_options_.client_cert_types[i]))); |
@@ -527,12 +529,12 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const { |
} |
// Check key exchange argument. |
- scoped_ptr<base::ListValue> key_exchange_values(new base::ListValue()); |
+ 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()); |
// Check bulk cipher argument. |
- scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue()); |
+ 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()); |
@@ -558,7 +560,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const { |
base::Value::CreateNullValue()); |
} |
if (!ssl_options_.npn_protocols.empty()) { |
- scoped_ptr<base::ListValue> npn_protocols(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> npn_protocols(new base::ListValue()); |
for (const std::string& proto : ssl_options_.npn_protocols) { |
npn_protocols->Append(new base::StringValue(proto)); |
} |
@@ -574,7 +576,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const { |
base::Value::CreateNullValue()); |
} |
if (!ssl_options_.supported_token_binding_params.empty()) { |
- scoped_ptr<base::ListValue> token_binding_params(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> token_binding_params( |
+ new base::ListValue()); |
arguments->Set( |
"token-binding-params", |
GetTokenBindingParams(ssl_options_.supported_token_binding_params)); |