Fixes to socket_test_util.cc.

net/dns/dns_transaction_unittest.cc

Index: net/dns/dns_transaction_unittest.cc
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 3e3c2fe7a0f464dfa63082e7f65f2339a38a3fb8..545dee4cbdf4c0f07443d9e06553088c4137965e 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -150,9 +150,9 @@ TEST_F(DnsTransactionTest, FirstTimeoutTest) {
              arraysize(kT0ResponseDatagram))
   };
 
-  scoped_refptr<DelayedSocketData> socket0_data(
+  scoped_ptr<DelayedSocketData> socket0_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
-  scoped_refptr<DelayedSocketData> socket1_data(
+  scoped_ptr<DelayedSocketData> socket1_data(
       new DelayedSocketData(0, reads0, arraysize(reads0),
                             writes0, arraysize(writes0)));
 
@@ -172,7 +172,6 @@ TEST_F(DnsTransactionTest, FirstTimeoutTest) {
   EXPECT_TRUE(socket0_data->at_write_eof());
   EXPECT_TRUE(socket1_data->at_read_eof());
   EXPECT_TRUE(socket1_data->at_write_eof());
-  EXPECT_EQ(2u, factory().udp_client_sockets().size());
 }
 
 // Test that after the first timeout we do a fresh connection, and after
@@ -189,11 +188,11 @@ TEST_F(DnsTransactionTest, SecondTimeoutTest) {
              arraysize(kT0ResponseDatagram))
   };
 
-  scoped_refptr<DelayedSocketData> socket0_data(
+  scoped_ptr<DelayedSocketData> socket0_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
-  scoped_refptr<DelayedSocketData> socket1_data(
+  scoped_ptr<DelayedSocketData> socket1_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
-  scoped_refptr<DelayedSocketData> socket2_data(
+  scoped_ptr<DelayedSocketData> socket2_data(
       new DelayedSocketData(0, reads0, arraysize(reads0),
                             writes0, arraysize(writes0)));
 
@@ -216,7 +215,6 @@ TEST_F(DnsTransactionTest, SecondTimeoutTest) {
   EXPECT_TRUE(socket1_data->at_write_eof());
   EXPECT_TRUE(socket2_data->at_read_eof());
   EXPECT_TRUE(socket2_data->at_write_eof());
-  EXPECT_EQ(3u, factory().udp_client_sockets().size());

[eroman, 2012/01/21 01:18:30]

is this change intentional?

[szym, 2012/01/21 06:59:16]

Yes. This check was redundant. There is only 3 SocketDataProviders and all of
them have to be at_xxx_eof.

Furthermore, the test will be replaced by
http://codereview.chromium.org/9190031/

 }
 
 // Test that after the first timeout we do a fresh connection, and after
@@ -228,11 +226,11 @@ TEST_F(DnsTransactionTest, ThirdTimeoutTest) {
               arraysize(kT0QueryDatagram))
   };
 
-  scoped_refptr<DelayedSocketData> socket0_data(
+  scoped_ptr<DelayedSocketData> socket0_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
-  scoped_refptr<DelayedSocketData> socket1_data(
+  scoped_ptr<DelayedSocketData> socket1_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
-  scoped_refptr<DelayedSocketData> socket2_data(
+  scoped_ptr<DelayedSocketData> socket2_data(
       new DelayedSocketData(2, NULL, 0, writes0, arraysize(writes0)));
 
   // Use short timeout to speed up the test.
@@ -254,7 +252,6 @@ TEST_F(DnsTransactionTest, ThirdTimeoutTest) {
   EXPECT_TRUE(socket1_data->at_write_eof());
   EXPECT_TRUE(socket2_data->at_read_eof());
   EXPECT_TRUE(socket2_data->at_write_eof());
-  EXPECT_EQ(3u, factory().udp_client_sockets().size());

[eroman, 2012/01/21 01:18:30]

is this change intentional?

 }
 
 }  // namespace