| Index: extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
|
| diff --git a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
|
| index a55d0b5e7383b69b4e90c0aba3e7117aeac57ee9..cc3f4cfc8537731abf0388e31f5c99b2632f71fa 100644
|
| --- a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
|
| +++ b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
|
| @@ -121,7 +121,8 @@ void SocketsTcpServerUpdateFunction::Work() {
|
| }
|
|
|
| SocketsTcpServerSetPausedFunction::SocketsTcpServerSetPausedFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsTcpServerSetPausedFunction::~SocketsTcpServerSetPausedFunction() {}
|
|
|
| @@ -136,7 +137,7 @@ bool SocketsTcpServerSetPausedFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "TCPServerSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsTcpServerSetPausedFunction::Work() {
|
| @@ -158,7 +159,8 @@ void SocketsTcpServerSetPausedFunction::Work() {
|
| }
|
|
|
| SocketsTcpServerListenFunction::SocketsTcpServerListenFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsTcpServerListenFunction::~SocketsTcpServerListenFunction() {}
|
|
|
| @@ -173,7 +175,7 @@ bool SocketsTcpServerListenFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "TCPServerSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsTcpServerListenFunction::Work() {
|
| @@ -280,7 +282,7 @@ bool SocketsTcpServerGetSocketsFunction::Prepare() { return true; }
|
| void SocketsTcpServerGetSocketsFunction::Work() {
|
| std::vector<linked_ptr<sockets_tcp_server::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) {
|
|
|