| Index: net/socket/socket_net_log_params.cc
|
| diff --git a/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc
|
| index 347644ac06dff6f49efd63ae4d076512db94dcec..d53bd8a62860fb660b17debbd253d3dcd82c83de 100644
|
| --- a/net/socket/socket_net_log_params.cc
|
| +++ b/net/socket/socket_net_log_params.cc
|
| @@ -15,37 +15,37 @@ namespace net {
|
|
|
| namespace {
|
|
|
| -scoped_ptr<base::Value> NetLogSocketErrorCallback(
|
| +std::unique_ptr<base::Value> NetLogSocketErrorCallback(
|
| int net_error,
|
| int os_error,
|
| NetLogCaptureMode /* capture_mode */) {
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetInteger("net_error", net_error);
|
| dict->SetInteger("os_error", os_error);
|
| return std::move(dict);
|
| }
|
|
|
| -scoped_ptr<base::Value> NetLogHostPortPairCallback(
|
| +std::unique_ptr<base::Value> NetLogHostPortPairCallback(
|
| const HostPortPair* host_and_port,
|
| NetLogCaptureMode /* capture_mode */) {
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetString("host_and_port", host_and_port->ToString());
|
| return std::move(dict);
|
| }
|
|
|
| -scoped_ptr<base::Value> NetLogIPEndPointCallback(
|
| +std::unique_ptr<base::Value> NetLogIPEndPointCallback(
|
| const IPEndPoint* address,
|
| NetLogCaptureMode /* capture_mode */) {
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetString("address", address->ToString());
|
| return std::move(dict);
|
| }
|
|
|
| -scoped_ptr<base::Value> NetLogSourceAddressCallback(
|
| +std::unique_ptr<base::Value> NetLogSourceAddressCallback(
|
| const struct sockaddr* net_address,
|
| socklen_t address_len,
|
| NetLogCaptureMode /* capture_mode */) {
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| IPEndPoint ipe;
|
| bool result = ipe.FromSockAddr(net_address, address_len);
|
| DCHECK(result);
|
|
|