Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / renderer / p2p / socket_client_impl.h

diff --git a/src/content/renderer/p2p/socket_client_impl.h b/src/content/renderer/p2p/socket_client_impl.h
index fb4703d..89e48c0 100644 (file)
--- a/src/content/renderer/p2p/socket_client_impl.h
+++ b/src/content/renderer/p2p/socket_client_impl.h
@@ -47,7 +47,7 @@ class P2PSocketClientImpl : public P2PSocketClient {
   // |dscp|.
   virtual void SendWithDscp(const net::IPEndPoint& address,
                             const std::vector<char>& data,
-                            const talk_base::PacketOptions& options) OVERRIDE;
+                            const rtc::PacketOptions& options) OVERRIDE;
 
   // Setting socket options.
   virtual void SetOption(P2PSocketOption option, int value) OVERRIDE;
@@ -74,7 +74,8 @@ class P2PSocketClientImpl : public P2PSocketClient {
   virtual ~P2PSocketClientImpl();
 
   // Message handlers that run on IPC thread.
-  void OnSocketCreated(const net::IPEndPoint& address);
+  void OnSocketCreated(const net::IPEndPoint& local_address,
+                       const net::IPEndPoint& remote_address);
   void OnIncomingTcpConnection(const net::IPEndPoint& address);
   void OnSendComplete(int packet_id);
   void OnSendComplete();
@@ -84,7 +85,8 @@ class P2PSocketClientImpl : public P2PSocketClient {
                       const base::TimeTicks& timestamp);
 
   // Proxy methods that deliver messages to the delegate thread.
-  void DeliverOnSocketCreated(const net::IPEndPoint& address);
+  void DeliverOnSocketCreated(const net::IPEndPoint& local_address,
+                              const net::IPEndPoint& remote_address);
   void DeliverOnIncomingTcpConnection(
       const net::IPEndPoint& address,
       scoped_refptr<P2PSocketClient> new_client);