| Index: webrtc/p2p/base/basicpacketsocketfactory.cc
 | 
| diff --git a/webrtc/p2p/base/basicpacketsocketfactory.cc b/webrtc/p2p/base/basicpacketsocketfactory.cc
 | 
| index c478d6311202108bbaff642768508171aa1f9f06..38a9642fc49a2e6888cf09acc9a621f97773868c 100644
 | 
| --- a/webrtc/p2p/base/basicpacketsocketfactory.cc
 | 
| +++ b/webrtc/p2p/base/basicpacketsocketfactory.cc
 | 
| @@ -27,20 +27,14 @@
 | 
|  namespace rtc {
 | 
|  
 | 
|  BasicPacketSocketFactory::BasicPacketSocketFactory()
 | 
| -    : thread_(Thread::Current()),
 | 
| -      socket_factory_(NULL) {
 | 
| -}
 | 
| +    : thread_(Thread::Current()), socket_factory_(nullptr) {}
 | 
|  
 | 
|  BasicPacketSocketFactory::BasicPacketSocketFactory(Thread* thread)
 | 
| -    : thread_(thread),
 | 
| -      socket_factory_(NULL) {
 | 
| -}
 | 
| +    : thread_(thread), socket_factory_(nullptr) {}
 | 
|  
 | 
|  BasicPacketSocketFactory::BasicPacketSocketFactory(
 | 
|      SocketFactory* socket_factory)
 | 
| -    : thread_(NULL),
 | 
| -      socket_factory_(socket_factory) {
 | 
| -}
 | 
| +    : thread_(nullptr), socket_factory_(socket_factory) {}
 | 
|  
 | 
|  BasicPacketSocketFactory::~BasicPacketSocketFactory() {
 | 
|  }
 | 
| @@ -53,13 +47,13 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateUdpSocket(
 | 
|    AsyncSocket* socket =
 | 
|        socket_factory()->CreateAsyncSocket(address.family(), SOCK_DGRAM);
 | 
|    if (!socket) {
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|    if (BindSocket(socket, address, min_port, max_port) < 0) {
 | 
|      LOG(LS_ERROR) << "UDP bind failed with error "
 | 
|                      << socket->GetError();
 | 
|      delete socket;
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|    return new AsyncUDPSocket(socket);
 | 
|  }
 | 
| @@ -72,20 +66,20 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateServerTcpSocket(
 | 
|    // Fail if TLS is required.
 | 
|    if (opts & PacketSocketFactory::OPT_TLS) {
 | 
|      LOG(LS_ERROR) << "TLS support currently is not available.";
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    AsyncSocket* socket =
 | 
|        socket_factory()->CreateAsyncSocket(local_address.family(), SOCK_STREAM);
 | 
|    if (!socket) {
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    if (BindSocket(socket, local_address, min_port, max_port) < 0) {
 | 
|      LOG(LS_ERROR) << "TCP bind failed with error "
 | 
|                    << socket->GetError();
 | 
|      delete socket;
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    // If using fake TLS, wrap the TCP socket in a pseudo-SSL socket.
 | 
| @@ -110,14 +104,14 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
 | 
|    AsyncSocket* socket =
 | 
|        socket_factory()->CreateAsyncSocket(local_address.family(), SOCK_STREAM);
 | 
|    if (!socket) {
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    if (BindSocket(socket, local_address, 0, 0) < 0) {
 | 
|      LOG(LS_ERROR) << "TCP bind failed with error "
 | 
|                    << socket->GetError();
 | 
|      delete socket;
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    // If using a proxy, wrap the socket in a proxy socket.
 | 
| @@ -141,7 +135,7 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
 | 
|      // Using TLS, wrap the socket in an SSL adapter.
 | 
|      SSLAdapter* ssl_adapter = SSLAdapter::Create(socket);
 | 
|      if (!ssl_adapter) {
 | 
| -      return NULL;
 | 
| +      return nullptr;
 | 
|      }
 | 
|  
 | 
|      if (tlsOpts & PacketSocketFactory::OPT_TLS_INSECURE) {
 | 
| @@ -152,7 +146,7 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
 | 
|  
 | 
|      if (ssl_adapter->StartSSL(remote_address.hostname().c_str(), false) != 0) {
 | 
|        delete ssl_adapter;
 | 
| -      return NULL;
 | 
| +      return nullptr;
 | 
|      }
 | 
|  
 | 
|    } else if (tlsOpts & PacketSocketFactory::OPT_TLS_FAKE) {
 | 
| @@ -164,7 +158,7 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
 | 
|      LOG(LS_ERROR) << "TCP connect failed with error "
 | 
|                    << socket->GetError();
 | 
|      delete socket;
 | 
| -    return NULL;
 | 
| +    return nullptr;
 | 
|    }
 | 
|  
 | 
|    // Finally, wrap that socket in a TCP or STUN TCP packet socket.
 | 
| 
 |