Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/tools/quic/quic_socket_utils.cc

Index: net/tools/quic/quic_socket_utils.cc
diff --git a/net/tools/quic/quic_socket_utils.cc b/net/tools/quic/quic_socket_utils.cc
index 1ef874ca45f3a4e7c90edc6ec8bd3e9c35a7963f..094ce86d48dd1eb6d87e3bdad8f2cb802d543777 100644
--- a/net/tools/quic/quic_socket_utils.cc
+++ b/net/tools/quic/quic_socket_utils.cc
@@ -291,12 +291,10 @@ int QuicSocketUtils::CreateUDPSocket(const IPEndPoint& address,
     return -1;
   }
 
-  if (FLAGS_quic_use_socket_timestamp) {
-    rc = SetGetSoftwareReceiveTimestamp(fd);
-    if (rc < 0) {
-      LOG(WARNING) << "SO_TIMESTAMPING not supported; using fallback: "
-                   << strerror(errno);
-    }
+  rc = SetGetSoftwareReceiveTimestamp(fd);
+  if (rc < 0) {
+    LOG(WARNING) << "SO_TIMESTAMPING not supported; using fallback: "
+                 << strerror(errno);
   }
 
   return fd;