Wire up rtc_packet_ids to P2PSocketHostTcp, which is required for correct BWE in WebRTC.

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 <stdint.h>
 
 #include <memory>
@@ skipping 11 matching lines @@
 namespace net {
 class DrainableIOBuffer;
 class GrowableIOBuffer;
 class StreamSocket;
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace content {
 
 class CONTENT_EXPORT P2PSocketHostTcpBase : public P2PSocketHost {
  public:

[Taylor_Brandstetter, 2017/04/25 21:34:19]

Could add a comment that the uint64_t is the packet ID. Also, does this need to
be public?

[Stefan, 2017/04/26 09:02:39]

More self explanatory now that I've made this a struct.

+  typedef std::pair<uint64_t, scoped_refptr<net::DrainableIOBuffer>> SendBuffer;

[Sergey Ulanov, 2017/04/26 00:11:52]

I think it would be better to replace this with a struct. Also does it need to
be public?

[Stefan, 2017/04/26 09:02:39]

Done.

+
   P2PSocketHostTcpBase(IPC::Sender* message_sender,
                        int socket_id,
                        P2PSocketType type,
                        net::URLRequestContextGetter* url_context);
   ~P2PSocketHostTcpBase() override;
 
   bool InitAccepted(const net::IPEndPoint& remote_address,
                     std::unique_ptr<net::StreamSocket> socket);
 
   // P2PSocketHost overrides.
@@ skipping 10 matching lines @@
       int id) override;
   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;
 
-  void WriteOrQueue(scoped_refptr<net::DrainableIOBuffer>& buffer);
+  void WriteOrQueue(SendBuffer& buffer);
   void OnPacket(const std::vector<char>& data);
   void OnError();
 
  private:
   friend class P2PSocketHostTcpTestBase;
   friend class P2PSocketHostTcpServerTest;
 
   // SSL/TLS connection functions.
   void StartTls();
   void ProcessTlsSslConnectDone(int status);
@@ skipping 10 matching lines @@
   void OnWritten(int result);
 
   // Helper method to send socket create message and start read.
   void OnOpen();
   bool DoSendSocketCreateMsg();
 
   P2PHostAndIPEndPoint remote_address_;
 
   std::unique_ptr<net::StreamSocket> socket_;
   scoped_refptr<net::GrowableIOBuffer> read_buffer_;
-  std::queue<scoped_refptr<net::DrainableIOBuffer> > write_queue_;
-  scoped_refptr<net::DrainableIOBuffer> write_buffer_;
+  std::queue<SendBuffer> write_queue_;
+  SendBuffer write_buffer_;
 
   bool write_pending_;
 
   bool connected_;
   P2PSocketType type_;
   scoped_refptr<net::URLRequestContextGetter> url_context_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcpBase);
 };
 
@@ skipping 37 matching lines @@
  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_