1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/content/renderer/p2p/socket_client_impl.h b/chromium/content/renderer/p2p/socket_client_impl.h
index 305a993a752..fb4703d73a7 100644
--- a/chromium/content/renderer/p2p/socket_client_impl.h
+++ b/chromium/content/renderer/p2p/socket_client_impl.h
@@ -8,12 +8,13 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/public/common/p2p_socket_type.h"
-#include "content/public/renderer/p2p_socket_client.h"
+#include "content/common/p2p_socket_type.h"
+#include "content/renderer/p2p/socket_client.h"
 #include "net/base/ip_endpoint.h"
 
 namespace base {
 class MessageLoopProxy;
+class TimeTicks;
 }  // namespace base
 
 namespace content {
@@ -35,7 +36,7 @@ class P2PSocketClientImpl : public P2PSocketClient {
   // P2P_SOCKET_TCP_CLIENT.
   virtual void Init(P2PSocketType type,
                     const net::IPEndPoint& local_address,
-                    const net::IPEndPoint& remote_address,
+                    const P2PHostAndIPEndPoint& remote_address,
                     P2PSocketClientDelegate* delegate);
 
   // Send the |data| to the |address|.
@@ -46,7 +47,10 @@ class P2PSocketClientImpl : public P2PSocketClient {
   // |dscp|.
   virtual void SendWithDscp(const net::IPEndPoint& address,
                             const std::vector<char>& data,
-                            net::DiffServCodePoint dscp) OVERRIDE;
+                            const talk_base::PacketOptions& options) OVERRIDE;
+
+  // Setting socket options.
+  virtual void SetOption(P2PSocketOption option, int value) OVERRIDE;
 
   // Must be called before the socket is destroyed. The delegate may
   // not be called after |closed_task| is executed.
@@ -93,7 +97,7 @@ class P2PSocketClientImpl : public P2PSocketClient {
   // Scheduled on the IPC thread to finish initialization.
   void DoInit(P2PSocketType type,
               const net::IPEndPoint& local_address,
-              const net::IPEndPoint& remote_address);
+              const P2PHostAndIPEndPoint& remote_address);
 
   // Scheduled on the IPC thread to finish closing the connection.
   void DoClose();