Index: net/websockets/websocket_throttle_unittest.cc |
diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc |
index c4bf59ffc5adf734a1145a13a1eb21270fbd5aa2..7eb18fa52567c8629120a5d2b5ce54ff50bf95f2 100644 |
--- a/net/websockets/websocket_throttle_unittest.cc |
+++ b/net/websockets/websocket_throttle_unittest.cc |
@@ -83,9 +83,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
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); |
@@ -103,9 +103,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
// 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); |
@@ -122,9 +122,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
// 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); |
@@ -141,9 +141,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
// 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); |
@@ -159,9 +159,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
// 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); |
@@ -177,9 +177,9 @@ TEST_F(WebSocketThrottleTest, Throttle) { |
// 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); |
@@ -286,9 +286,9 @@ TEST_F(WebSocketThrottleTest, NoThrottleForDuplicateAddress) { |
// 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); |