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

net/tools/quic/quic_packet_reader.cc

Index: net/tools/quic/quic_packet_reader.cc
diff --git a/net/tools/quic/quic_packet_reader.cc b/net/tools/quic/quic_packet_reader.cc
index 5e690a4836d61d09430ce48006093122781e680e..a0803ec7fa390eaccf7449b35ca3cb0e6a2ba269 100644
--- a/net/tools/quic/quic_packet_reader.cc
+++ b/net/tools/quic/quic_packet_reader.cc
@@ -121,15 +121,13 @@ bool QuicPacketReader::ReadAndDispatchManyPackets(
       continue;
     }
 
-    if (FLAGS_quic_use_socket_timestamp) {
-      if (packet_timestamp == QuicTime::Zero()) {
-        // This isn't particularly desirable, but not all platforms support
-        // socket timestamping.
-        if (fallback_timestamp == QuicTime::Zero()) {
-          fallback_timestamp = clock.Now();
-        }
-        packet_timestamp = fallback_timestamp;
+    if (packet_timestamp == QuicTime::Zero()) {
+      // This isn't particularly desirable, but not all platforms support socket
+      // timestamping.
+      if (fallback_timestamp == QuicTime::Zero()) {
+        fallback_timestamp = clock.Now();
       }
+      packet_timestamp = fallback_timestamp;
     }
 
     QuicReceivedPacket packet(reinterpret_cast<char*>(packets_[i].iov.iov_base),
@@ -175,7 +173,7 @@ bool QuicPacketReader::ReadAndDispatchSinglePacket(
     QUIC_BUG << "Unable to get server address.";
     return false;
   }
-  if (FLAGS_quic_use_socket_timestamp && timestamp == QuicTime::Zero()) {
+  if (timestamp == QuicTime::Zero()) {
     // This isn't particularly desirable, but not all platforms support socket
     // timestamping.
     timestamp = clock.Now();