Revert 273745 "Implements RTP header dumping." due to memory leak

trunk/src/content/browser/renderer_host/p2p/socket_host.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_H_
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_H_
 
-#include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_socket_type.h"
-#include "content/public/browser/render_process_host.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/datagram_socket.h"
 
 namespace IPC {
 class Sender;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
@@ skipping 10 matching lines @@
 // This method can handle only RTP packet, otherwise this method must not be
 // called. It will try to do, 1. update absolute send time extension header
 // if present with current time and 2. update HMAC in RTP packet.
 // If abs_send_time is 0, ApplyPacketOption will get current time from system.
 CONTENT_EXPORT bool ApplyPacketOptions(char* data, int length,
                                        const talk_base::PacketOptions& options,
                                        uint32 abs_send_time);
 
 // Helper method which finds RTP ofset and length if the packet is encapsulated
 // in a TURN Channel Message or TURN Send Indication message.
-CONTENT_EXPORT bool GetRtpPacketStartPositionAndLength(const char* data,
-                                                       int length,
+CONTENT_EXPORT bool GetRtpPacketStartPositionAndLength(char* data, int length,
                                                        int* rtp_start_pos,
                                                        int* rtp_packet_length);
 // Helper method which updates absoulute send time extension if present.
 CONTENT_EXPORT bool UpdateRtpAbsSendTimeExtn(char* rtp, int length,
                                              int extension_id,
                                              uint32 abs_send_time);
 
 }  // packet_processing_helpers
 
 // Base class for P2P sockets.
 class CONTENT_EXPORT P2PSocketHost {
  public:
   static const int kStunHeaderSize = 20;
   // Creates P2PSocketHost of the specific type.
   static P2PSocketHost* Create(IPC::Sender* message_sender,
-                               int socket_id,
-                               P2PSocketType type,
+                               int id, P2PSocketType type,
                                net::URLRequestContextGetter* url_context,
                                P2PMessageThrottler* throttler);
 
   virtual ~P2PSocketHost();
 
   // Initalizes the socket. Returns false when initiazations fails.
   virtual bool Init(const net::IPEndPoint& local_address,
                     const P2PHostAndIPEndPoint& remote_address) = 0;
 
   // Sends |data| on the socket to |to|.
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
                     const talk_base::PacketOptions& options,
                     uint64 packet_id) = 0;
 
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
       const net::IPEndPoint& remote_address, int id) = 0;
 
   virtual bool SetOption(P2PSocketOption option, int value) = 0;
 
-  void StartRtpDump(
-      bool incoming,
-      bool outgoing,
-      const RenderProcessHost::WebRtcRtpPacketCallback& packet_callback);
-  void StopRtpDump(bool incoming, bool outgoing);
-
  protected:
   friend class P2PSocketHostTcpTestBase;
 
   // TODO(mallinath) - Remove this below enum and use one defined in
   // libjingle/souce/talk/p2p/base/stun.h
   enum StunMessageType {
     STUN_BINDING_REQUEST = 0x0001,
     STUN_BINDING_RESPONSE = 0x0101,
     STUN_BINDING_ERROR_RESPONSE = 0x0111,
     STUN_SHARED_SECRET_REQUEST = 0x0002,
@@ skipping 17 matching lines @@
   };
 
   enum State {
     STATE_UNINITIALIZED,
     STATE_CONNECTING,
     STATE_TLS_CONNECTING,
     STATE_OPEN,
     STATE_ERROR,
   };
 
-  P2PSocketHost(IPC::Sender* message_sender, int socket_id);
+  P2PSocketHost(IPC::Sender* message_sender, int id);
 
   // Verifies that the packet |data| has a valid STUN header. In case
   // of success stores type of the message in |type|.
   static bool GetStunPacketType(const char* data, int data_size,
                                 StunMessageType* type);
   static bool IsRequestOrResponse(StunMessageType type);
 
-  // Calls |packet_dump_callback_| to record the RTP header.
-  void DumpRtpPacket(const char* packet, size_t length, bool incoming);
-
-  // A helper to dump the packet on the IO thread.
-  void DumpRtpPacketOnIOThread(scoped_ptr<uint8[]> packet_header,
-                               size_t header_length,
-                               size_t packet_length,
-                               bool incoming);
-
   IPC::Sender* message_sender_;
   int id_;
   State state_;
-  bool dump_incoming_rtp_packet_;
-  bool dump_outgoing_rtp_packet_;
-  RenderProcessHost::WebRtcRtpPacketCallback packet_dump_callback_;
-
-  base::WeakPtrFactory<P2PSocketHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_H_