diff options
Diffstat (limited to 'net/websockets/websocket_throttle_unittest.cc')
| -rw-r--r-- | net/websockets/websocket_throttle_unittest.cc | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc index a323734..4f0345c 100644 --- a/net/websockets/websocket_throttle_unittest.cc +++ b/net/websockets/websocket_throttle_unittest.cc @@ -76,12 +76,12 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host1/"), w1.get())); s1->set_context(&context); w1->InitSocketStream(s1.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s1, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s1.get(), 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.callback())); + EXPECT_EQ(OK, w1->OnStartOpenConnection(s1.get(), callback_s1.callback())); // Now connecting to host1, so waiting queue looks like // Address | head -> tail @@ -97,13 +97,13 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host2/"), w2.get())); s2->set_context(&context); w2->InitSocketStream(s2.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s2, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s2.get(), 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.callback())); + w2->OnStartOpenConnection(s2.get(), callback_s2.callback())); // Now waiting queue looks like // Address | head -> tail // 1.2.3.4 | w1 w2 @@ -118,13 +118,13 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host3/"), w3.get())); s3->set_context(&context); w3->InitSocketStream(s3.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s3, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s3.get(), 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.callback())); + w3->OnStartOpenConnection(s3.get(), callback_s3.callback())); // Address | head -> tail // 1.2.3.4 | w1 w2 // 1.2.3.5 | w1 w3 @@ -139,13 +139,13 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host4/"), w4.get())); s4->set_context(&context); w4->InitSocketStream(s4.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s4, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s4.get(), 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.callback())); + w4->OnStartOpenConnection(s4.get(), callback_s4.callback())); // Address | head -> tail // 1.2.3.4 | w1 w2 w4 // 1.2.3.5 | w1 w3 @@ -159,13 +159,13 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host5/"), w5.get())); s5->set_context(&context); w5->InitSocketStream(s5.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s5, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s5.get(), 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.callback())); + w5->OnStartOpenConnection(s5.get(), callback_s5.callback())); // Address | head -> tail // 1.2.3.4 | w1 w2 w4 // 1.2.3.5 | w1 w3 @@ -179,13 +179,13 @@ TEST_F(WebSocketThrottleTest, Throttle) { new SocketStream(GURL("ws://host6/"), w6.get())); s6->set_context(&context); w6->InitSocketStream(s6.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s6, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s6.get(), 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.callback())); + w6->OnStartOpenConnection(s6.get(), callback_s6.callback())); // Address | head -> tail // 1.2.3.4 | w1 w2 w4 // 1.2.3.5 | w1 w3 @@ -292,12 +292,12 @@ TEST_F(WebSocketThrottleTest, NoThrottleForDuplicateAddress) { new SocketStream(GURL("ws://localhost/"), w1.get())); s1->set_context(&context); w1->InitSocketStream(s1.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s1, addr); + WebSocketThrottleTest::MockSocketStreamConnect(s1.get(), 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.callback())); + EXPECT_EQ(OK, w1->OnStartOpenConnection(s1.get(), callback_s1.callback())); DVLOG(1) << "socket1 close"; w1->OnClose(s1.get()); @@ -321,12 +321,13 @@ TEST_F(WebSocketThrottleTest, NoThrottleForDistinctPort) { new SocketStream(GURL("ws://localhost:80/"), w1.get())); s1->set_context(&context); w1->InitSocketStream(s1.get()); - MockSocketStreamConnect(s1, AddressList::CreateFromIPAddress(localhost, 80)); + MockSocketStreamConnect(s1.get(), + AddressList::CreateFromIPAddress(localhost, 80)); DVLOG(1) << "connecting socket1"; TestCompletionCallback callback_s1; // Trying to open connection to localhost:80 will start without waiting. - EXPECT_EQ(OK, w1->OnStartOpenConnection(s1, callback_s1.callback())); + EXPECT_EQ(OK, w1->OnStartOpenConnection(s1.get(), callback_s1.callback())); // socket2: 127.0.0.1:81 scoped_refptr<WebSocketJob> w2(new WebSocketJob(&delegate)); @@ -334,12 +335,13 @@ TEST_F(WebSocketThrottleTest, NoThrottleForDistinctPort) { new SocketStream(GURL("ws://localhost:81/"), w2.get())); s2->set_context(&context); w2->InitSocketStream(s2.get()); - MockSocketStreamConnect(s2, AddressList::CreateFromIPAddress(localhost, 81)); + MockSocketStreamConnect(s2.get(), + AddressList::CreateFromIPAddress(localhost, 81)); DVLOG(1) << "connecting socket2"; TestCompletionCallback callback_s2; // Trying to open connection to localhost:81 will start without waiting. - EXPECT_EQ(OK, w2->OnStartOpenConnection(s2, callback_s2.callback())); + EXPECT_EQ(OK, w2->OnStartOpenConnection(s2.get(), callback_s2.callback())); DVLOG(1) << "closing socket1"; w1->OnClose(s1.get()); |