Update webrtc to r4819.

content/renderer/p2p/ipc_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 "content/renderer/p2p/ipc_socket_factory.h"
 
 #include <deque>
 
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ skipping 30 matching lines @@
   virtual ~IpcPacketSocket();
 
   // Always takes ownership of client even if initialization fails.
   bool Init(P2PSocketType type, P2PSocketClient* client,
             const talk_base::SocketAddress& local_address,
             const talk_base::SocketAddress& remote_address);
 
   // 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;
   virtual int SetOption(talk_base::Socket::Option opt, int value) OVERRIDE;
   virtual int GetError() const OVERRIDE;
   virtual void SetError(int error) OVERRIDE;
 
   // P2PSocketClient::Delegate implementation.
   virtual void OnOpen(const net::IPEndPoint& address) OVERRIDE;
   virtual void OnIncomingTcpConnection(const net::IPEndPoint& address,
@@ skipping 131 matching lines @@
 talk_base::SocketAddress IpcPacketSocket::GetLocalAddress() const {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   return local_address_;
 }
 
 talk_base::SocketAddress IpcPacketSocket::GetRemoteAddress() const {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   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*/) {

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

Does the name need to be commented?

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

Isn't the style where you will not use the variable in the method? Done.


On 2013/09/23 22:32:36, Sergey Ulanov wrote:

[Sergey Ulanov, 2013/09/23 23:16:08]

It may be necessary for compilers that warn about unused parameters, but such
warnings should be disabled in chrome.

   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
 
   switch (state_) {
     case IS_UNINITIALIZED:
       NOTREACHED();
       return EWOULDBLOCK;
     case IS_OPENING:
       return EWOULDBLOCK;
     case IS_CLOSED:
       return ENOTCONN;
@@ skipping 222 matching lines @@
   }
   P2PSocketClient* socket_client = new P2PSocketClient(socket_dispatcher_);
   scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
   if (!socket->Init(type, socket_client, local_address,
                     remote_address))
     return NULL;
   return socket.release();
 }
 
 }  // namespace content