Fixes to socket_test_util.cc.

net/dns/dns_transaction_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/dns_transaction.h"
 
 #include <deque>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 132 matching lines @@
   MockWrite writes0[] = {
     MockWrite(true, reinterpret_cast<const char*>(kT0QueryDatagram),
               arraysize(kT0QueryDatagram))
   };
 
   MockRead reads0[] = {
     MockRead(true, reinterpret_cast<const char*>(kT0ResponseDatagram),
              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)));
 
   // Use short timeout to speed up the test.
   ConfigureSession(base::TimeDelta::FromMilliseconds(
       TestTimeouts::tiny_timeout_ms()));
   factory().AddSocketDataProvider(socket0_data.get());
   factory().AddSocketDataProvider(socket1_data.get());
 
   StartTransaction();
 
   MessageLoop::current()->Run();
 
   EXPECT_EQ(OK, rv());
 
   EXPECT_TRUE(socket0_data->at_read_eof());
   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
 // the second timeout we do another fresh connection, and if we get a
 // response on the second connection, we return it.
 TEST_F(DnsTransactionTest, SecondTimeoutTest) {
   MockWrite writes0[] = {
     MockWrite(true, reinterpret_cast<const char*>(kT0QueryDatagram),
               arraysize(kT0QueryDatagram))
   };
 
   MockRead reads0[] = {
     MockRead(true, reinterpret_cast<const char*>(kT0ResponseDatagram),
              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)));
 
   // Use short timeout to speed up the test.
   ConfigureSession(base::TimeDelta::FromMilliseconds(
       TestTimeouts::tiny_timeout_ms()));
   factory().AddSocketDataProvider(socket0_data.get());
   factory().AddSocketDataProvider(socket1_data.get());
   factory().AddSocketDataProvider(socket2_data.get());
 
   StartTransaction();
 
   MessageLoop::current()->Run();
 
   EXPECT_EQ(OK, rv());
 
   EXPECT_TRUE(socket0_data->at_read_eof());
   EXPECT_TRUE(socket0_data->at_write_eof());
   EXPECT_TRUE(socket1_data->at_read_eof());
   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
 // the second timeout we do another fresh connection and after the third
 // timeout we give up and return a timeout error.
 TEST_F(DnsTransactionTest, ThirdTimeoutTest) {
   MockWrite writes0[] = {
     MockWrite(true, reinterpret_cast<const char*>(kT0QueryDatagram),
               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.
   ConfigureSession(base::TimeDelta::FromMilliseconds(
       TestTimeouts::tiny_timeout_ms()));
   factory().AddSocketDataProvider(socket0_data.get());
   factory().AddSocketDataProvider(socket1_data.get());
   factory().AddSocketDataProvider(socket2_data.get());
 
   StartTransaction();
 
   MessageLoop::current()->Run();
 
   EXPECT_EQ(ERR_DNS_TIMED_OUT, rv());
 
   EXPECT_TRUE(socket0_data->at_read_eof());
   EXPECT_TRUE(socket0_data->at_write_eof());
   EXPECT_TRUE(socket1_data->at_read_eof());
   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
 
 }  // namespace net