roll webrtc 4595:4612

R=mallinath@chromium.org Review URL: https://codereview.chromium.org/23392008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219463 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Aug 24, 2013 · 932feec · 932feec
1 parent a757813
commit 932feec
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/DEPS b/DEPS
@@ -38,7 +38,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling WebRTC
   # and V8 without interference from each other.
-  "webrtc_revision": "4595",
+  "webrtc_revision": "4612",
   "jsoncpp_revision": "248",
   "nss_revision": "209026",
   # Three lines of non-changing comments so that

diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -38,6 +38,17 @@ class MockTransportChannel : public cricket::TransportChannel {
   MOCK_METHOD2(SetOption, int(talk_base::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_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
+  MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
+  MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
+                                          const uint8* context,
+                                          size_t context_len,
+                                          bool use_context,
+                                          uint8* result,
+                                          size_t result_len));
 };
 
 class TransportChannelSocketAdapterTest : public testing::Test {

diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc
@@ -56,7 +56,7 @@ JingleThreadWrapper::JingleThreadWrapper(
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   DCHECK(task_runner->BelongsToCurrentThread());
   DCHECK(!talk_base::Thread::Current());
-  talk_base::MessageQueueManager::Instance()->Add(this);
+  talk_base::MessageQueueManager::Add(this);
   WrapCurrent();
 }
 
@@ -69,7 +69,7 @@ void JingleThreadWrapper::WillDestroyCurrentMessageLoop() {
   UnwrapCurrent();
   g_jingle_thread_wrapper.Get().Set(NULL);
   talk_base::ThreadManager::Instance()->SetCurrentThread(NULL);
-  talk_base::MessageQueueManager::Instance()->Remove(this);
+  talk_base::MessageQueueManager::Remove(this);
   talk_base::SocketServer* ss = socketserver();
   delete this;
   delete ss;

diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/webrtc/
 Version: unknown
-Revision: 4595
+Revision: 4612
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes

diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
@@ -448,6 +448,8 @@
         '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h',
         '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc',
         '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h',
+        '<(libjingle_source)/talk/p2p/base/transportdescription.cc',
+        '<(libjingle_source)/talk/p2p/base/transportdescription.h',
         '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc',
         '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h',
         '<(libjingle_source)/talk/p2p/base/turnport.cc',