Update webrtc to r4819.

R=ronghuawu@chromium.org, sergeyu@chromium.org

Review URL: https://codereview.chromium.org/24364005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224826 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 55 insertions, 26 deletions

diff --git a/DEPS b/DEPS
index 0ff63e1..82082d1 100644
--- 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": "4794",
+  "webrtc_revision": "4819",
   "jsoncpp_revision": "248",
   "nss_revision": "223139",
   # Three lines of non-changing comments so that
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 5f8d6f0f..ced8822 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -48,9 +48,11 @@ class IpcPacketSocket : public talk_base::AsyncPacketSocket,
   // talk_base::AsyncPacketSocket interface.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
-  virtual int Send(const void *pv, size_t cb) OVERRIDE;
+  virtual int Send(const void *pv, size_t cb,
+                   talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
-                     const talk_base::SocketAddress& addr) OVERRIDE;
+                     const talk_base::SocketAddress& addr,
+                     talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
@@ -202,13 +204,15 @@ talk_base::SocketAddress IpcPacketSocket::GetRemoteAddress() const {
   return remote_address_;
 }
 
-int IpcPacketSocket::Send(const void *data, size_t data_size) {
+int IpcPacketSocket::Send(const void *data, size_t data_size,
+                          talk_base::DiffServCodePoint dscp) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
-  return SendTo(data, data_size, remote_address_);
+  return SendTo(data, data_size, remote_address_, dscp);
 }
 
 int IpcPacketSocket::SendTo(const void *data, size_t data_size,
-                            const talk_base::SocketAddress& address) {
+                            const talk_base::SocketAddress& address,
+                            talk_base::DiffServCodePoint dscp) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
 
   switch (state_) {
diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc
index 0f68d50..27f0080 100644
--- a/jingle/glue/channel_socket_adapter.cc
+++ b/jingle/glue/channel_socket_adapter.cc
@@ -77,7 +77,8 @@ int TransportChannelSocketAdapter::Write(
 
   int result;
   if (channel_->writable()) {
-    result = channel_->SendPacket(buffer->data(), buffer_size);
+    result = channel_->SendPacket(buffer->data(), buffer_size,
+                                  talk_base::DSCP_NO_CHANGE);
     if (result < 0) {
       result = net::MapSystemError(channel_->GetError());
 
@@ -171,7 +172,8 @@ void TransportChannelSocketAdapter::OnWritableState(
   // Try to send the packet if there is a pending write.
   if (!write_callback_.is_null()) {
     int result = channel_->SendPacket(write_buffer_->data(),
-                                      write_buffer_size_);
+                                      write_buffer_size_,
+                                      talk_base::DSCP_NO_CHANGE);
     if (result < 0)
       result = net::MapSystemError(channel_->GetError());
 
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 32aa7cc..580a34d 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -34,7 +34,10 @@ class MockTransportChannel : public cricket::TransportChannel {
     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, ReadClose) {
 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, Write) {
 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));
 
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc
index c5465a6f..823367f 100644
--- a/jingle/glue/fake_socket_factory.cc
+++ b/jingle/glue/fake_socket_factory.cc
@@ -33,13 +33,15 @@ talk_base::SocketAddress FakeUDPPacketSocket::GetRemoteAddress() const {
   return remote_address_;
 }
 
-int FakeUDPPacketSocket::Send(const void *data, size_t data_size) {
+int FakeUDPPacketSocket::Send(const void *data, size_t data_size,
+                              talk_base::DiffServCodePoint dscp) {
   DCHECK(CalledOnValidThread());
-  return SendTo(data, data_size, remote_address_);
+  return SendTo(data, data_size, remote_address_, dscp);
 }
 
 int FakeUDPPacketSocket::SendTo(const void *data, size_t data_size,
-                                const talk_base::SocketAddress& address) {
+                                const talk_base::SocketAddress& address,
+                                talk_base::DiffServCodePoint dscp) {
   DCHECK(CalledOnValidThread());
 
   if (state_ == IS_CLOSED) {
diff --git a/jingle/glue/fake_socket_factory.h b/jingle/glue/fake_socket_factory.h
index cb56a3c..e9af78d 100644
--- a/jingle/glue/fake_socket_factory.h
+++ b/jingle/glue/fake_socket_factory.h
@@ -38,9 +38,11 @@ class FakeUDPPacketSocket : public talk_base::AsyncPacketSocket,
   // talk_base::AsyncPacketSocket implementation.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
-  virtual int Send(const void *pv, size_t cb) OVERRIDE;
+  virtual int Send(const void *pv, size_t cb,
+                   talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
-                     const talk_base::SocketAddress& addr) OVERRIDE;
+                     const talk_base::SocketAddress& addr,
+                     talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index 2f37ee2..1295a60 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -40,10 +40,12 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket {
   // talk_base::AsyncPacketSocket interface.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
-  virtual int Send(const void* data, size_t data_size) OVERRIDE;
+  virtual int Send(const void* data, size_t data_size,
+                   talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int SendTo(const void* data,
                      size_t data_size,
-                     const talk_base::SocketAddress& address) OVERRIDE;
+                     const talk_base::SocketAddress& address,
+                     talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
@@ -190,7 +192,8 @@ talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
   return talk_base::SocketAddress();
 }
 
-int UdpPacketSocket::Send(const void* data, size_t data_size) {
+int UdpPacketSocket::Send(const void* data, size_t data_size,
+                          talk_base::DiffServCodePoint dscp) {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
   return EWOULDBLOCK;
@@ -198,7 +201,8 @@ int UdpPacketSocket::Send(const void* data, size_t data_size) {
 
 int UdpPacketSocket::SendTo(const void* data,
                             size_t data_size,
-                            const talk_base::SocketAddress& address) {
+                            const talk_base::SocketAddress& address,
+                            talk_base::DiffServCodePoint dscp) {
   if (state_ != STATE_BOUND) {
     // TODO(sergeyu): StunPort may try to send stun request before we
     // are bound. Fix that problem and change this to DCHECK.
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc
index d894087..f95dff3 100644
--- a/remoting/jingle_glue/chromium_socket_factory.cc
+++ b/remoting/jingle_glue/chromium_socket_factory.cc
@@ -45,9 +45,11 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket {
   // talk_base::AsyncPacketSocket interface.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
-  virtual int Send(const void* data, size_t data_size) OVERRIDE;
+  virtual int Send(const void* data, size_t data_size,
+                   talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int SendTo(const void* data, size_t data_size,
-                     const talk_base::SocketAddress& address) OVERRIDE;
+                     const talk_base::SocketAddress& address,
+                     talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
@@ -159,14 +161,16 @@ talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
   return talk_base::SocketAddress();
 }
 
-int UdpPacketSocket::Send(const void* data, size_t data_size) {
+int UdpPacketSocket::Send(const void* data, size_t data_size,
+                          talk_base::DiffServCodePoint dscp) {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
   return EWOULDBLOCK;
 }
 
 int UdpPacketSocket::SendTo(const void* data, size_t data_size,
-                            const talk_base::SocketAddress& address) {
+                            const talk_base::SocketAddress& address,
+                            talk_base::DiffServCodePoint dscp) {
   if (state_ != STATE_BOUND) {
     NOTREACHED();
     return EINVAL;
@@ -237,6 +241,10 @@ int UdpPacketSocket::SetOption(talk_base::Socket::Option option, int value) {
     case talk_base::Socket::OPT_IPV6_V6ONLY:
       NOTIMPLEMENTED();
       return -1;
+
+    case talk_base::Socket::OPT_DSCP:
+      NOTIMPLEMENTED();
+      return -1;
   }
 
   NOTREACHED();
diff --git a/remoting/jingle_glue/chromium_socket_factory_unittest.cc b/remoting/jingle_glue/chromium_socket_factory_unittest.cc
index 4af8e77..29375e7 100644
--- a/remoting/jingle_glue/chromium_socket_factory_unittest.cc
+++ b/remoting/jingle_glue/chromium_socket_factory_unittest.cc
@@ -66,7 +66,8 @@ TEST_F(ChromiumSocketFactoryTest, SendAndReceive) {
   int attempts = 0;
   while (last_packet_.empty() && attempts++ < kMaxAttempts) {
     sending_socket->SendTo(test_packet.data(), test_packet.size(),
-                           socket_->GetLocalAddress());
+                           socket_->GetLocalAddress(),
+                           talk_base::DSCP_NO_CHANGE);
     message_loop_.PostDelayedTask(FROM_HERE, run_loop_.QuitClosure(),
                                   kAttemptPeriod);
     run_loop_.Run();
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index d6f4b59..afa121d 100644
--- 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: 4794
+Revision: 4819
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 9c62fcd..c56638a 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -282,6 +282,7 @@
         '<(libjingle_source)/talk/base/cryptstring.h',
         '<(libjingle_source)/talk/base/diskcache.cc',
         '<(libjingle_source)/talk/base/diskcache.h',
+        '<(libjingle_source)/talk/base/dscp.h',
         '<(libjingle_source)/talk/base/event.cc',
         '<(libjingle_source)/talk/base/event.h',
         '<(libjingle_source)/talk/base/fileutils.cc',