| Index: extensions/browser/api/sockets_udp/sockets_udp_api.cc
|
| diff --git a/extensions/browser/api/sockets_udp/sockets_udp_api.cc b/extensions/browser/api/sockets_udp/sockets_udp_api.cc
|
| index d213ffddbe2f707f850d1bfd9e4446a6c43cbe97..09eb01dbd64d16894b8667ec67864f19d54613a7 100644
|
| --- a/extensions/browser/api/sockets_udp/sockets_udp_api.cc
|
| +++ b/extensions/browser/api/sockets_udp/sockets_udp_api.cc
|
| @@ -132,7 +132,8 @@ void SocketsUdpUpdateFunction::Work() {
|
| }
|
|
|
| SocketsUdpSetPausedFunction::SocketsUdpSetPausedFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsUdpSetPausedFunction::~SocketsUdpSetPausedFunction() {}
|
|
|
| @@ -146,7 +147,7 @@ bool SocketsUdpSetPausedFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "UDPSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsUdpSetPausedFunction::Work() {
|
| @@ -168,7 +169,8 @@ void SocketsUdpSetPausedFunction::Work() {
|
| }
|
|
|
| SocketsUdpBindFunction::SocketsUdpBindFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsUdpBindFunction::~SocketsUdpBindFunction() {}
|
|
|
| @@ -182,7 +184,7 @@ bool SocketsUdpBindFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "UDPSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsUdpBindFunction::Work() {
|
| @@ -341,7 +343,7 @@ bool SocketsUdpGetSocketsFunction::Prepare() { return true; }
|
| void SocketsUdpGetSocketsFunction::Work() {
|
| std::vector<linked_ptr<sockets_udp::SocketInfo> > socket_infos;
|
| base::hash_set<int>* resource_ids = GetSocketIds();
|
| - if (resource_ids != NULL) {
|
| + if (resource_ids != nullptr) {
|
| for (base::hash_set<int>::iterator it = resource_ids->begin();
|
| it != resource_ids->end();
|
| ++it) {
|
|
|