| Index: extensions/browser/api/socket/udp_socket.cc
|
| diff --git a/extensions/browser/api/socket/udp_socket.cc b/extensions/browser/api/socket/udp_socket.cc
|
| index 50da3e23d86abeb9fd489695ce50c67be88035dc..4da81f6a9114d1b88401133ec1bd5b43ef72bd2c 100644
|
| --- a/extensions/browser/api/socket/udp_socket.cc
|
| +++ b/extensions/browser/api/socket/udp_socket.cc
|
| @@ -30,8 +30,9 @@ UDPSocket::UDPSocket(const std::string& owner_extension_id)
|
| : Socket(owner_extension_id),
|
| socket_(net::DatagramSocket::DEFAULT_BIND,
|
| net::RandIntCallback(),
|
| - NULL,
|
| - net::NetLog::Source()) {}
|
| + nullptr,
|
| + net::NetLog::Source()) {
|
| +}
|
|
|
| UDPSocket::~UDPSocket() { Disconnect(); }
|
|
|
| @@ -80,7 +81,7 @@ void UDPSocket::Read(int count, const ReadCompletionCallback& callback) {
|
| DCHECK(!callback.is_null());
|
|
|
| if (!read_callback_.is_null()) {
|
| - callback.Run(net::ERR_IO_PENDING, NULL);
|
| + callback.Run(net::ERR_IO_PENDING, nullptr);
|
| return;
|
| } else {
|
| read_callback_ = callback;
|
| @@ -125,7 +126,7 @@ void UDPSocket::RecvFrom(int count,
|
| DCHECK(!callback.is_null());
|
|
|
| if (!recv_from_callback_.is_null()) {
|
| - callback.Run(net::ERR_IO_PENDING, NULL, std::string(), 0);
|
| + callback.Run(net::ERR_IO_PENDING, nullptr, std::string(), 0);
|
| return;
|
| } else {
|
| recv_from_callback_ = callback;
|
|
|