Index: net/dns/dns_session_unittest.cc |
diff --git a/net/dns/dns_session_unittest.cc b/net/dns/dns_session_unittest.cc |
index ed726f23234963f59f3532e05c42ab45345895d9..67094e1b81ecc80cf73310304cf2a653701637ba 100644 |
--- a/net/dns/dns_session_unittest.cc |
+++ b/net/dns/dns_session_unittest.cc |
@@ -34,7 +34,8 @@ class TestClientSocketFactory : public ClientSocketFactory { |
virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( |
const AddressList& addresses, |
- NetLog*, const NetLog::Source&) OVERRIDE { |
+ NetLog*, |
+ const NetLog::Source&) OVERRIDE { |
NOTIMPLEMENTED(); |
return scoped_ptr<StreamSocket>(); |
} |
@@ -48,9 +49,7 @@ class TestClientSocketFactory : public ClientSocketFactory { |
return scoped_ptr<SSLClientSocket>(); |
} |
- virtual void ClearSSLSessionCache() OVERRIDE { |
- NOTIMPLEMENTED(); |
- } |
+ virtual void ClearSSLSessionCache() OVERRIDE { NOTIMPLEMENTED(); } |
private: |
std::list<SocketDataProvider*> data_providers_; |
@@ -86,13 +85,12 @@ class DnsSessionTest : public testing::Test { |
class MockDnsSocketPool : public DnsSocketPool { |
public: |
MockDnsSocketPool(ClientSocketFactory* factory, DnsSessionTest* test) |
- : DnsSocketPool(factory), test_(test) { } |
+ : DnsSocketPool(factory), test_(test) {} |
- virtual ~MockDnsSocketPool() { } |
+ virtual ~MockDnsSocketPool() {} |
- 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); |
} |
@@ -102,9 +100,8 @@ class MockDnsSocketPool : 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 { |
test_->OnSocketFreed(server_index); |
} |
@@ -143,12 +140,12 @@ scoped_ptr<DnsSession::SocketLease> DnsSessionTest::Allocate( |
} |
bool DnsSessionTest::DidAllocate(unsigned server_index) { |
- PoolEvent expected_event = { PoolEvent::ALLOCATE, server_index }; |
+ PoolEvent expected_event = {PoolEvent::ALLOCATE, server_index}; |
return ExpectEvent(expected_event); |
} |
bool DnsSessionTest::DidFree(unsigned server_index) { |
- PoolEvent expected_event = { PoolEvent::FREE, server_index }; |
+ PoolEvent expected_event = {PoolEvent::FREE, server_index}; |
return ExpectEvent(expected_event); |
} |
@@ -157,12 +154,12 @@ bool DnsSessionTest::NoMoreEvents() { |
} |
void DnsSessionTest::OnSocketAllocated(unsigned server_index) { |
- PoolEvent event = { PoolEvent::ALLOCATE, server_index }; |
+ PoolEvent event = {PoolEvent::ALLOCATE, server_index}; |
events_.push_back(event); |
} |
void DnsSessionTest::OnSocketFreed(unsigned server_index) { |
- PoolEvent event = { PoolEvent::FREE, server_index }; |
+ PoolEvent event = {PoolEvent::FREE, server_index}; |
events_.push_back(event); |
} |
@@ -172,8 +169,8 @@ bool DnsSessionTest::ExpectEvent(const PoolEvent& expected) { |
} |
const PoolEvent actual = events_.front(); |
- if ((expected.action != actual.action) |
- || (expected.server_index != actual.server_index)) { |
+ if ((expected.action != actual.action) || |
+ (expected.server_index != actual.server_index)) { |
return false; |
} |
events_.pop_front(); |
@@ -249,4 +246,4 @@ TEST_F(DnsSessionTest, HistogramTimeoutLong) { |
} // namespace |
-} // namespace net |
+} // namespace net |