Revert "Update webrtc&libjingle 6774:6799."

content/browser/renderer_host/p2p/socket_host_tcp.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_
 
 #include <queue>
 #include <vector>
 
@@ skipping 24 matching lines @@
   virtual ~P2PSocketHostTcpBase();
 
   bool InitAccepted(const net::IPEndPoint& remote_address,
                     net::StreamSocket* socket);
 
   // P2PSocketHost overrides.
   virtual bool Init(const net::IPEndPoint& local_address,
                     const P2PHostAndIPEndPoint& remote_address) OVERRIDE;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
-                    const rtc::PacketOptions& options,
+                    const talk_base::PacketOptions& options,
                     uint64 packet_id) OVERRIDE;
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
       const net::IPEndPoint& remote_address, int id) OVERRIDE;
   virtual bool SetOption(P2PSocketOption option, int value) OVERRIDE;
 
  protected:
   // Derived classes will provide the implementation.
   virtual int ProcessInput(char* input, int input_len) = 0;
   virtual void DoSend(const net::IPEndPoint& to,
                       const std::vector<char>& data,
-                      const rtc::PacketOptions& options) = 0;
+                      const talk_base::PacketOptions& options) = 0;
 
   void WriteOrQueue(scoped_refptr<net::DrainableIOBuffer>& buffer);
   void OnPacket(const std::vector<char>& data);
   void OnError();
 
  private:
   friend class P2PSocketHostTcpTestBase;
   friend class P2PSocketHostTcpServerTest;
 
   // SSL/TLS connection functions.
@@ skipping 36 matching lines @@
   P2PSocketHostTcp(IPC::Sender* message_sender,
                    int socket_id,
                    P2PSocketType type,
                    net::URLRequestContextGetter* url_context);
   virtual ~P2PSocketHostTcp();
 
  protected:
   virtual int ProcessInput(char* input, int input_len) OVERRIDE;
   virtual void DoSend(const net::IPEndPoint& to,
                       const std::vector<char>& data,
-                      const rtc::PacketOptions& options) OVERRIDE;
+                      const talk_base::PacketOptions& options) OVERRIDE;
  private:
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcp);
 };
 
 // P2PSocketHostStunTcp class provides the framing of STUN messages when used
 // with TURN. These messages will not have length at front of the packet and
 // are padded to multiple of 4 bytes.
 // Formatting of messages is defined in RFC5766.
 class CONTENT_EXPORT P2PSocketHostStunTcp : public P2PSocketHostTcpBase {
  public:
   P2PSocketHostStunTcp(IPC::Sender* message_sender,
                        int socket_id,
                        P2PSocketType type,
                        net::URLRequestContextGetter* url_context);
 
   virtual ~P2PSocketHostStunTcp();
 
  protected:
   virtual int ProcessInput(char* input, int input_len) OVERRIDE;
   virtual void DoSend(const net::IPEndPoint& to,
                       const std::vector<char>& data,
-                      const rtc::PacketOptions& options) OVERRIDE;
+                      const talk_base::PacketOptions& options) OVERRIDE;
  private:
   int GetExpectedPacketSize(const char* data, int len, int* pad_bytes);
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHostStunTcp);
 };
 
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_