Update webrtc&libjingle 6774:6825.

jingle/glue/channel_socket_adapter_unittest.cc

Index: jingle/glue/channel_socket_adapter_unittest.cc
===================================================================
--- jingle/glue/channel_socket_adapter_unittest.cc	(revision 287594)
+++ jingle/glue/channel_socket_adapter_unittest.cc	(working copy)
@@ -36,19 +36,19 @@
 
   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 @@
   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_);
 }