summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/cast_channel
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 10:47:35 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 10:47:35 +0000
commitbe06dec5b64b67d6f40dd7b58f18d376a16f442c (patch)
tree32abeed28d27003fbf8e80c02359a1ed39b0a277 /chrome/browser/extensions/api/cast_channel
parent4791ba4c33ae8dfc6a3617ced47c5d1ee320ddae (diff)
downloadchromium_src-be06dec5b64b67d6f40dd7b58f18d376a16f442c.zip
chromium_src-be06dec5b64b67d6f40dd7b58f18d376a16f442c.tar.gz
chromium_src-be06dec5b64b67d6f40dd7b58f18d376a16f442c.tar.bz2
Fix the warning in CastSocket tests
Review URL: https://codereview.chromium.org/75103005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/cast_channel')
-rw-r--r--chrome/browser/extensions/api/cast_channel/cast_socket_unittest.cc36
1 files changed, 12 insertions, 24 deletions
diff --git a/chrome/browser/extensions/api/cast_channel/cast_socket_unittest.cc b/chrome/browser/extensions/api/cast_channel/cast_socket_unittest.cc
index 3076fe3..80d288d 100644
--- a/chrome/browser/extensions/api/cast_channel/cast_socket_unittest.cc
+++ b/chrome/browser/extensions/api/cast_channel/cast_socket_unittest.cc
@@ -18,6 +18,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using ::testing::_;
using ::testing::A;
using ::testing::DoAll;
using ::testing::Return;
@@ -229,6 +230,8 @@ class CastSocketTest : public testing::Test {
EXPECT_CALL(mock_tcp_socket(), Connect(A<const net::CompletionCallback&>()))
.Times(1)
.WillOnce(DoAll(SaveArg<0>(callback), Return(result)));
+ EXPECT_CALL(mock_tcp_socket(), SetKeepAlive(_, _))
+ .WillOnce(Return(true));
}
// Same as ExpectTcpConnect but to return net::ERR_IO_PENDING.
@@ -658,14 +661,9 @@ TEST_F(CastSocketTest, TestRead) {
std::string message_data;
ASSERT_TRUE(CastSocket::Serialize(test_proto_, &message_data));
- EXPECT_CALL(mock_tcp_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback1),
- Return(net::ERR_IO_PENDING)));
- EXPECT_CALL(mock_ssl_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback2),
- Return(net::ERR_IO_PENDING)));
+ ExpectTcpConnect(&connect_callback1, net::ERR_IO_PENDING);
+ ExpectSslConnect(&connect_callback2, net::ERR_IO_PENDING);
+
EXPECT_CALL(handler_, OnConnectComplete(net::OK));
EXPECT_CALL(mock_ssl_socket(), Read(A<net::IOBuffer*>(),
A<int>(),
@@ -719,14 +717,9 @@ TEST_F(CastSocketTest, TestReadMany) {
ASSERT_TRUE(CastSocket::Serialize(test_proto_, &message_data[i]));
}
- EXPECT_CALL(mock_tcp_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback1),
- Return(net::ERR_IO_PENDING)));
- EXPECT_CALL(mock_ssl_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback2),
- Return(net::ERR_IO_PENDING)));
+ ExpectTcpConnect(&connect_callback1, net::ERR_IO_PENDING);
+ ExpectSslConnect(&connect_callback2, net::ERR_IO_PENDING);
+
EXPECT_CALL(handler_, OnConnectComplete(net::OK));
EXPECT_CALL(mock_ssl_socket(), Read(A<net::IOBuffer*>(),
A<int>(),
@@ -769,14 +762,9 @@ TEST_F(CastSocketTest, TestReadError) {
net::CompletionCallback connect_callback2;
net::CompletionCallback read_callback;
- EXPECT_CALL(mock_tcp_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback1),
- Return(net::ERR_IO_PENDING)));
- EXPECT_CALL(mock_ssl_socket(), Connect(A<const net::CompletionCallback&>()))
- .Times(1)
- .WillOnce(DoAll(SaveArg<0>(&connect_callback2),
- Return(net::ERR_IO_PENDING)));
+ ExpectTcpConnect(&connect_callback1, net::ERR_IO_PENDING);
+ ExpectSslConnect(&connect_callback2, net::ERR_IO_PENDING);
+
EXPECT_CALL(handler_, OnConnectComplete(net::OK));
EXPECT_CALL(mock_ssl_socket(), Read(A<net::IOBuffer*>(),
A<int>(),