Convert implicit scoped_refptr constructor calls to explicit ones, part 1

net/websockets/websocket_throttle_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/address_list.h"
 #include "net/base/sys_addrinfo.h"
@@ skipping 65 matching lines @@
   }
 };
 
 TEST_F(WebSocketThrottleTest, Throttle) {
   DummySocketStreamDelegate delegate;
 
   // For host1: 1.2.3.4, 1.2.3.5, 1.2.3.6
   struct addrinfo* addr = AddAddr(1, 2, 3, 4, NULL);
   addr = AddAddr(1, 2, 3, 5, addr);
   addr = AddAddr(1, 2, 3, 6, addr);
-  scoped_refptr<WebSocketJob> w1 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s1 =
-      new SocketStream(GURL("ws://host1/"), w1.get());
+  scoped_refptr<WebSocketJob> w1(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s1(
+      new SocketStream(GURL("ws://host1/"), w1.get()));
   w1->InitSocketStream(s1.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s1, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket1";
   TestCompletionCallback callback_s1;
   // Trying to open connection to host1 will start without wait.
   EXPECT_EQ(OK, w1->OnStartOpenConnection(s1, &callback_s1));
 
   // Now connecting to host1, so waiting queue looks like
   // Address | head -> tail
   // 1.2.3.4 | w1
   // 1.2.3.5 | w1
   // 1.2.3.6 | w1
 
   // For host2: 1.2.3.4
   addr = AddAddr(1, 2, 3, 4, NULL);
-  scoped_refptr<WebSocketJob> w2 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s2 =
-      new SocketStream(GURL("ws://host2/"), w2.get());
+  scoped_refptr<WebSocketJob> w2(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s2(
+      new SocketStream(GURL("ws://host2/"), w2.get()));
   w2->InitSocketStream(s2.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s2, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket2";
   TestCompletionCallback callback_s2;
   // Trying to open connection to host2 will wait for w1.
   EXPECT_EQ(ERR_IO_PENDING, w2->OnStartOpenConnection(s2, &callback_s2));
   // Now waiting queue looks like
   // Address | head -> tail
   // 1.2.3.4 | w1 w2
   // 1.2.3.5 | w1
   // 1.2.3.6 | w1
 
   // For host3: 1.2.3.5
   addr = AddAddr(1, 2, 3, 5, NULL);
-  scoped_refptr<WebSocketJob> w3 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s3 =
-      new SocketStream(GURL("ws://host3/"), w3.get());
+  scoped_refptr<WebSocketJob> w3(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s3(
+      new SocketStream(GURL("ws://host3/"), w3.get()));
   w3->InitSocketStream(s3.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s3, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket3";
   TestCompletionCallback callback_s3;
   // Trying to open connection to host3 will wait for w1.
   EXPECT_EQ(ERR_IO_PENDING, w3->OnStartOpenConnection(s3, &callback_s3));
   // Address | head -> tail
   // 1.2.3.4 | w1 w2
   // 1.2.3.5 | w1    w3
   // 1.2.3.6 | w1
 
   // For host4: 1.2.3.4, 1.2.3.6
   addr = AddAddr(1, 2, 3, 4, NULL);
   addr = AddAddr(1, 2, 3, 6, addr);
-  scoped_refptr<WebSocketJob> w4 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s4 =
-      new SocketStream(GURL("ws://host4/"), w4.get());
+  scoped_refptr<WebSocketJob> w4(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s4(
+      new SocketStream(GURL("ws://host4/"), w4.get()));
   w4->InitSocketStream(s4.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s4, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket4";
   TestCompletionCallback callback_s4;
   // Trying to open connection to host4 will wait for w1, w2.
   EXPECT_EQ(ERR_IO_PENDING, w4->OnStartOpenConnection(s4, &callback_s4));
   // Address | head -> tail
   // 1.2.3.4 | w1 w2    w4
   // 1.2.3.5 | w1    w3
   // 1.2.3.6 | w1       w4
 
   // For host5: 1.2.3.6
   addr = AddAddr(1, 2, 3, 6, NULL);
-  scoped_refptr<WebSocketJob> w5 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s5 =
-      new SocketStream(GURL("ws://host5/"), w5.get());
+  scoped_refptr<WebSocketJob> w5(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s5(
+      new SocketStream(GURL("ws://host5/"), w5.get()));
   w5->InitSocketStream(s5.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s5, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket5";
   TestCompletionCallback callback_s5;
   // Trying to open connection to host5 will wait for w1, w4
   EXPECT_EQ(ERR_IO_PENDING, w5->OnStartOpenConnection(s5, &callback_s5));
   // Address | head -> tail
   // 1.2.3.4 | w1 w2    w4
   // 1.2.3.5 | w1    w3
   // 1.2.3.6 | w1       w4 w5
 
   // For host6: 1.2.3.6
   addr = AddAddr(1, 2, 3, 6, NULL);
-  scoped_refptr<WebSocketJob> w6 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s6 =
-      new SocketStream(GURL("ws://host6/"), w6.get());
+  scoped_refptr<WebSocketJob> w6(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s6(
+      new SocketStream(GURL("ws://host6/"), w6.get()));
   w6->InitSocketStream(s6.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s6, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket6";
   TestCompletionCallback callback_s6;
   // Trying to open connection to host6 will wait for w1, w4, w5
   EXPECT_EQ(ERR_IO_PENDING, w6->OnStartOpenConnection(s6, &callback_s6));
   // Address | head -> tail
   // 1.2.3.4 | w1 w2    w4
@@ skipping 86 matching lines @@
   DVLOG(1) << "Done";
   MessageLoopForIO::current()->RunAllPending();
 }
 
 TEST_F(WebSocketThrottleTest, NoThrottleForDuplicateAddress) {
   DummySocketStreamDelegate delegate;
 
   // For localhost: 127.0.0.1, 127.0.0.1
   struct addrinfo* addr = AddAddr(127, 0, 0, 1, NULL);
   addr = AddAddr(127, 0, 0, 1, addr);
-  scoped_refptr<WebSocketJob> w1 = new WebSocketJob(&delegate);
-  scoped_refptr<SocketStream> s1 =
-      new SocketStream(GURL("ws://localhost/"), w1.get());
+  scoped_refptr<WebSocketJob> w1(new WebSocketJob(&delegate));
+  scoped_refptr<SocketStream> s1(
+      new SocketStream(GURL("ws://localhost/"), w1.get()));
   w1->InitSocketStream(s1.get());
   WebSocketThrottleTest::MockSocketStreamConnect(s1, addr);
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket1";
   TestCompletionCallback callback_s1;
   // Trying to open connection to localhost will start without wait.
   EXPECT_EQ(OK, w1->OnStartOpenConnection(s1, &callback_s1));
 
   DVLOG(1) << "socket1 close";
   w1->OnClose(s1.get());
   s1->DetachDelegate();
   DVLOG(1) << "Done";
   MessageLoopForIO::current()->RunAllPending();
 }
 
 }