| Index: net/dns/dns_socket_pool.cc
|
| diff --git a/net/dns/dns_socket_pool.cc b/net/dns/dns_socket_pool.cc
|
| index b446fa07d62f204e2bc4565749c755dd6bf237b3..9cde8da6ad041951c6c3dd74c83e598bdd577cc5 100644
|
| --- a/net/dns/dns_socket_pool.cc
|
| +++ b/net/dns/dns_socket_pool.cc
|
| @@ -36,7 +36,7 @@ const unsigned kInitialPoolSize = 0;
|
| const unsigned kAllocateMinSize = 1;
|
| #endif
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| DnsSocketPool::DnsSocketPool(ClientSocketFactory* socket_factory)
|
| : socket_factory_(socket_factory),
|
| @@ -61,9 +61,8 @@ scoped_ptr<StreamSocket> DnsSocketPool::CreateTCPSocket(
|
| const NetLog::Source& source) {
|
| DCHECK_LT(server_index, nameservers_->size());
|
|
|
| - return scoped_ptr<StreamSocket>(
|
| - socket_factory_->CreateTransportClientSocket(
|
| - AddressList((*nameservers_)[server_index]), net_log_, source));
|
| + return scoped_ptr<StreamSocket>(socket_factory_->CreateTransportClientSocket(
|
| + AddressList((*nameservers_)[server_index]), net_log_, source));
|
| }
|
|
|
| scoped_ptr<DatagramClientSocket> DnsSocketPool::CreateConnectedSocket(
|
| @@ -91,13 +90,10 @@ scoped_ptr<DatagramClientSocket> DnsSocketPool::CreateConnectedSocket(
|
|
|
| class NullDnsSocketPool : public DnsSocketPool {
|
| public:
|
| - NullDnsSocketPool(ClientSocketFactory* factory)
|
| - : DnsSocketPool(factory) {
|
| - }
|
| + NullDnsSocketPool(ClientSocketFactory* factory) : DnsSocketPool(factory) {}
|
|
|
| - virtual void Initialize(
|
| - const std::vector<IPEndPoint>* nameservers,
|
| - NetLog* net_log) OVERRIDE {
|
| + virtual void Initialize(const std::vector<IPEndPoint>* nameservers,
|
| + NetLog* net_log) OVERRIDE {
|
| InitializeInternal(nameservers, net_log);
|
| }
|
|
|
| @@ -106,10 +102,8 @@ class NullDnsSocketPool : public DnsSocketPool {
|
| return CreateConnectedSocket(server_index);
|
| }
|
|
|
| - virtual void FreeSocket(
|
| - unsigned server_index,
|
| - scoped_ptr<DatagramClientSocket> socket) OVERRIDE {
|
| - }
|
| + virtual void FreeSocket(unsigned server_index,
|
| + scoped_ptr<DatagramClientSocket> socket) OVERRIDE {}
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(NullDnsSocketPool);
|
| @@ -124,21 +118,18 @@ scoped_ptr<DnsSocketPool> DnsSocketPool::CreateNull(
|
| class DefaultDnsSocketPool : public DnsSocketPool {
|
| public:
|
| DefaultDnsSocketPool(ClientSocketFactory* factory)
|
| - : DnsSocketPool(factory) {
|
| - };
|
| + : DnsSocketPool(factory) {};
|
|
|
| virtual ~DefaultDnsSocketPool();
|
|
|
| - virtual void Initialize(
|
| - const std::vector<IPEndPoint>* nameservers,
|
| - NetLog* net_log) OVERRIDE;
|
| + virtual void Initialize(const std::vector<IPEndPoint>* nameservers,
|
| + NetLog* net_log) OVERRIDE;
|
|
|
| virtual scoped_ptr<DatagramClientSocket> AllocateSocket(
|
| unsigned server_index) OVERRIDE;
|
|
|
| - virtual void FreeSocket(
|
| - unsigned server_index,
|
| - scoped_ptr<DatagramClientSocket> socket) OVERRIDE;
|
| + virtual void FreeSocket(unsigned server_index,
|
| + scoped_ptr<DatagramClientSocket> socket) OVERRIDE;
|
|
|
| private:
|
| void FillPool(unsigned server_index, unsigned size);
|
| @@ -201,9 +192,8 @@ scoped_ptr<DatagramClientSocket> DefaultDnsSocketPool::AllocateSocket(
|
| return scoped_ptr<DatagramClientSocket>(socket);
|
| }
|
|
|
| -void DefaultDnsSocketPool::FreeSocket(
|
| - unsigned server_index,
|
| - scoped_ptr<DatagramClientSocket> socket) {
|
| +void DefaultDnsSocketPool::FreeSocket(unsigned server_index,
|
| + scoped_ptr<DatagramClientSocket> socket) {
|
| DCHECK_LT(server_index, pools_.size());
|
| }
|
|
|
| @@ -219,4 +209,4 @@ void DefaultDnsSocketPool::FillPool(unsigned server_index, unsigned size) {
|
| }
|
| }
|
|
|
| -} // namespace net
|
| +} // namespace net
|
|
|