Relanding PacketOptions CL after revert

content/browser/renderer_host/p2p/socket_host_udp.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_UDP_H_
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_UDP_H_
 
 #include <deque>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_server_socket.h"
+#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 namespace content {
 
 class P2PMessageThrottler;
 
 class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
  public:
   P2PSocketHostUdp(IPC::Sender* message_sender, int id,
                    P2PMessageThrottler* throttler);
   virtual ~P2PSocketHostUdp();
 
   // P2PSocketHost overrides.
   virtual bool Init(const net::IPEndPoint& local_address,
                     const net::IPEndPoint& remote_address) OVERRIDE;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
-                    net::DiffServCodePoint dscp,
+                    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;
 
  private:
   friend class P2PSocketHostUdpTest;
 
   typedef std::set<net::IPEndPoint> ConnectedPeerSet;
 
   struct PendingPacket {
     PendingPacket(const net::IPEndPoint& to,
                   const std::vector<char>& content,
-                  net::DiffServCodePoint dscp,
+                  const talk_base::PacketOptions& options,
                   uint64 id);
     ~PendingPacket();
     net::IPEndPoint to;
     scoped_refptr<net::IOBuffer> data;
     int size;
-    net::DiffServCodePoint dscp;
+    talk_base::PacketOptions packet_options;
     uint64 id;
   };
 
   void OnError();
 
   void DoRead();
   void OnRecv(int result);
   void HandleReadResult(int result);
 
   void DoSend(const PendingPacket& packet);
@@ skipping 12 matching lines @@
   // response or relay allocation request or response.
   ConnectedPeerSet connected_peers_;
   P2PMessageThrottler* throttler_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHostUdp);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_UDP_H_