Update webrtc to r4819.

remoting/jingle_glue/chromium_socket_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/jingle_glue/chromium_socket_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/glue/utils.h"
@@ skipping 27 matching lines @@
  public:
   UdpPacketSocket();
   virtual ~UdpPacketSocket();
 
   bool Init(const talk_base::SocketAddress& local_address,
             int min_port, int max_port);
 
   // 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;
   virtual int SetOption(talk_base::Socket::Option option, int value) OVERRIDE;
   virtual int GetError() const OVERRIDE;
   virtual void SetError(int error) OVERRIDE;
 
  private:
   struct PendingPacket {
     PendingPacket(const void* buffer,
@@ skipping 91 matching lines @@
   DCHECK_EQ(state_, STATE_BOUND);
   return local_address_;
 }
 
 talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
   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*/) {

[Sergey Ulanov, 2013/09/23 22:32:36]

ditto

[Mallinath (Gone from Chromium), 2013/09/23 22:38:14]

Done.

   if (state_ != STATE_BOUND) {
     NOTREACHED();
     return EINVAL;
   }
 
   if (error_ != 0) {
     return error_;
   }
 
   net::IPEndPoint endpoint;
@@ skipping 50 matching lines @@
     }
 
     case talk_base::Socket::OPT_NODELAY:
       // OPT_NODELAY is only for TCP sockets.
       NOTREACHED();
       return -1;
 
     case talk_base::Socket::OPT_IPV6_V6ONLY:
       NOTIMPLEMENTED();
       return -1;
+
+    case talk_base::Socket::OPT_DSCP:
+      NOTIMPLEMENTED();
+      return -1;
   }
 
   NOTREACHED();
   return -1;
 }
 
 int UdpPacketSocket::GetError() const {
   return error_;
 }
 
@@ skipping 107 matching lines @@
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
       int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace remoting