Relanding PacketOptions CL after revert

content/renderer/p2p/socket_client.h

Index: content/renderer/p2p/socket_client.h
diff --git a/content/renderer/p2p/socket_client.h b/content/renderer/p2p/socket_client.h
index eb2bf7a97066121c94029d05f02e1b02e866da63..5d1ecb5db906b3b612bdf7a20ed41641589e3d54 100644
--- a/content/renderer/p2p/socket_client.h
+++ b/content/renderer/p2p/socket_client.h
@@ -11,6 +11,10 @@
 #include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 
+namespace talk_base {
+struct PacketOptions;
+};
+
 namespace content {
 
 class P2PSocketClientDelegate;
@@ -40,7 +44,7 @@ class P2PSocketClient : public base::RefCountedThreadSafe<P2PSocketClient> {
   // |dscp|.
   virtual void SendWithDscp(const net::IPEndPoint& address,
                             const std::vector<char>& data,
-                            net::DiffServCodePoint dscp) = 0;
+                            const talk_base::PacketOptions& options) = 0;
 
   virtual void SetOption(P2PSocketOption option, int value) = 0;