| Index: extensions/common/api/sockets/sockets_manifest_permission.cc
|
| diff --git a/extensions/common/api/sockets/sockets_manifest_permission.cc b/extensions/common/api/sockets/sockets_manifest_permission.cc
|
| index f695494e7b7f68ced683dc4dfd01ccd92f49c4a9..7124b80e0f8b7a5d021590669d312b9a9b37fba4 100644
|
| --- a/extensions/common/api/sockets/sockets_manifest_permission.cc
|
| +++ b/extensions/common/api/sockets/sockets_manifest_permission.cc
|
| @@ -202,21 +202,21 @@ scoped_ptr<base::Value> SocketsManifestPermission::ToValue() const {
|
| if (sockets.udp->bind->as_strings->size() == 0 &&
|
| sockets.udp->send->as_strings->size() == 0 &&
|
| sockets.udp->multicast_membership->as_strings->size() == 0) {
|
| - sockets.udp.reset(NULL);
|
| + sockets.udp.reset(nullptr);
|
| }
|
|
|
| sockets.tcp.reset(new Sockets::Tcp());
|
| SetHostPatterns(
|
| sockets.tcp->connect, this, SocketPermissionRequest::TCP_CONNECT);
|
| if (sockets.tcp->connect->as_strings->size() == 0) {
|
| - sockets.tcp.reset(NULL);
|
| + sockets.tcp.reset(nullptr);
|
| }
|
|
|
| sockets.tcp_server.reset(new Sockets::TcpServer());
|
| SetHostPatterns(
|
| sockets.tcp_server->listen, this, SocketPermissionRequest::TCP_LISTEN);
|
| if (sockets.tcp_server->listen->as_strings->size() == 0) {
|
| - sockets.tcp_server.reset(NULL);
|
| + sockets.tcp_server.reset(nullptr);
|
| }
|
|
|
| return scoped_ptr<base::Value>(sockets.ToValue().release()).Pass();
|
|
|