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

net/tools/quic/quic_socket_utils.cc

 // Copyright (c) 2012 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.
 
 #include "net/tools/quic/quic_socket_utils.h"
 
 #include <errno.h>
 #include <linux/net_tstamp.h>
 #include <netinet/in.h>
 #include <string.h>
@@ skipping 273 matching lines @@
   if (!SetSendBufferSize(fd, kDefaultSocketReceiveBuffer)) {
     return -1;
   }
 
   rc = SetGetAddressInfo(fd, address_family);
   if (rc < 0) {
     LOG(ERROR) << "IP detection not supported" << strerror(errno);
     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;
 }
 
 }  // namespace net