Land Recent QUIC Changes.

net/tools/quic/quic_socket_utils.h

Index: net/tools/quic/quic_socket_utils.h
diff --git a/net/tools/quic/quic_socket_utils.h b/net/tools/quic/quic_socket_utils.h
index 7341c87cd12351a3348b286f109082fcfb9a3e71..de4f7af24624aaf8b0e6ded11441a2452700f258 100644
--- a/net/tools/quic/quic_socket_utils.h
+++ b/net/tools/quic/quic_socket_utils.h
@@ -63,6 +63,11 @@ class QuicSocketUtils {
                                  const IPAddressNumber& self_address,
                                  const IPEndPoint& peer_address);
 
+  // A helper for WritePacket which fills in the cmsg with the supplied self
+  // address.
+  static void SetIpInfoInCmsg(const IPAddressNumber& self_address,
+                              cmsghdr* cmsg);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicSocketUtils);
 };