Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Unified Diff: jingle/glue/channel_socket_adapter_unittest.cc

Issue 24364005: Update webrtc to r4819. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/glue/channel_socket_adapter.cc ('k') | jingle/glue/fake_socket_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/channel_socket_adapter_unittest.cc
===================================================================
--- jingle/glue/channel_socket_adapter_unittest.cc (revision 224785)
+++ jingle/glue/channel_socket_adapter_unittest.cc (working copy)
@@ -34,7 +34,10 @@
set_readable(true);
}
- MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags));
+ MOCK_METHOD4(SendPacket, int(const char* data,
+ size_t len,
+ talk_base::DiffServCodePoint dscp,
+ int flags));
MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
MOCK_METHOD0(GetError, int());
MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
@@ -104,7 +107,8 @@
TEST_F(TransportChannelSocketAdapterTest, Write) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
- EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+ EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+ talk_base::DSCP_NO_CHANGE, 0))
.WillOnce(Return(kTestDataSize));
int result = target_->Write(buffer.get(), kTestDataSize, callback_);
@@ -116,7 +120,8 @@
TEST_F(TransportChannelSocketAdapterTest, WritePending) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
- EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+ EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+ talk_base::DSCP_NO_CHANGE, 0))
.Times(1)
.WillOnce(Return(SOCKET_ERROR));
« no previous file with comments | « jingle/glue/channel_socket_adapter.cc ('k') | jingle/glue/fake_socket_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698