diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:53:01 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:53:01 +0000 |
| commit | dd946bb05f5ec8c5c70f2c7ce6a5ffb8fe6cd4ad (patch) | |
| tree | 8a826db736cbce4eeef35de5cae9397b701acb58 /net/dns | |
| parent | bde236e6b1ba61d54bdf3158b91640596aa186b3 (diff) | |
| download | chromium_src-dd946bb05f5ec8c5c70f2c7ce6a5ffb8fe6cd4ad.zip chromium_src-dd946bb05f5ec8c5c70f2c7ce6a5ffb8fe6cd4ad.tar.gz chromium_src-dd946bb05f5ec8c5c70f2c7ce6a5ffb8fe6cd4ad.tar.bz2 | |
Rewrite scoped_ptr<T>(NULL) to use the default ctor in net/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool
across all files built on Linux in the net/ directory.
BUG=173286
Review URL: https://chromiumcodereview.appspot.com/16434016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_session.cc | 3 | ||||
| -rw-r--r-- | net/dns/dns_socket_pool.cc | 2 | ||||
| -rw-r--r-- | net/dns/dns_transaction_unittest.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc index 2e6d0c9..3577212 100644 --- a/net/dns/dns_session.cc +++ b/net/dns/dns_session.cc @@ -229,7 +229,8 @@ scoped_ptr<DnsSession::SocketLease> DnsSession::AllocateSocket( scoped_ptr<DatagramClientSocket> socket; socket = socket_pool_->AllocateSocket(server_index); - if (!socket.get()) return scoped_ptr<SocketLease>(NULL); + if (!socket.get()) + return scoped_ptr<SocketLease>(); socket->NetLog().BeginEvent(NetLog::TYPE_SOCKET_IN_USE, source.ToEventParametersCallback()); diff --git a/net/dns/dns_socket_pool.cc b/net/dns/dns_socket_pool.cc index cc6552e..64570fc 100644 --- a/net/dns/dns_socket_pool.cc +++ b/net/dns/dns_socket_pool.cc @@ -187,7 +187,7 @@ scoped_ptr<DatagramClientSocket> DefaultDnsSocketPool::AllocateSocket( FillPool(server_index, kAllocateMinSize); if (pool.size() == 0) { LOG(WARNING) << "No DNS sockets available in pool " << server_index << "!"; - return scoped_ptr<DatagramClientSocket>(NULL); + return scoped_ptr<DatagramClientSocket>(); } if (pool.size() < kAllocateMinSize) { diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index f7c1cab..ee79005 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -330,7 +330,7 @@ class TransactionHelper { class DnsTransactionTest : public testing::Test { public: - DnsTransactionTest() : socket_factory_(NULL) {} + DnsTransactionTest() {} // Generates |nameservers| for DnsConfig. void ConfigureNumServers(unsigned num_servers) { |