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

Unified Diff: jingle/glue/channel_socket_adapter_unittest.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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/chrome_async_socket.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
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 436f8f70f5f89055ba240928f1552692f85c54e9..2baa37f61e349021620aa18da611a38186531352 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -36,19 +36,19 @@ class MockTransportChannel : public cricket::TransportChannel {
MOCK_METHOD4(SendPacket, int(const char* data,
size_t len,
- const talk_base::PacketOptions& options,
+ const rtc::PacketOptions& options,
int flags));
- MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
+ MOCK_METHOD2(SetOption, int(rtc::Socket::Option opt, int value));
MOCK_METHOD0(GetError, int());
MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
MOCK_METHOD1(GetStats, bool(cricket::ConnectionInfos* infos));
MOCK_CONST_METHOD0(IsDtlsActive, bool());
- MOCK_CONST_METHOD1(GetSslRole, bool(talk_base::SSLRole* role));
+ MOCK_CONST_METHOD1(GetSslRole, bool(rtc::SSLRole* role));
MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
- MOCK_CONST_METHOD1(GetLocalIdentity, bool(talk_base::SSLIdentity** identity));
+ MOCK_CONST_METHOD1(GetLocalIdentity, bool(rtc::SSLIdentity** identity));
MOCK_CONST_METHOD1(GetRemoteCertificate,
- bool(talk_base::SSLCertificate** cert));
+ bool(rtc::SSLCertificate** cert));
MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
const uint8* context,
size_t context_len,
@@ -89,7 +89,7 @@ TEST_F(TransportChannelSocketAdapterTest, Read) {
ASSERT_EQ(net::ERR_IO_PENDING, result);
channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize,
- talk_base::CreatePacketTime(0), 0);
+ rtc::CreatePacketTime(0), 0);
EXPECT_EQ(kTestDataSize, callback_result_);
}
« no previous file with comments | « jingle/glue/channel_socket_adapter.cc ('k') | jingle/glue/chrome_async_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698