Landing Recent QUIC changes until 2016-07-02 02:45 UTC

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 38 matching lines @@
                  cmsg->cmsg_type == SO_TIMESTAMPING) {
         LinuxTimestamping* lts =
             reinterpret_cast<LinuxTimestamping*>(CMSG_DATA(cmsg));
         timespec* ts = &lts->systime;
         int64_t usec = (static_cast<int64_t>(ts->tv_sec) * 1000 * 1000) +
                        (static_cast<int64_t>(ts->tv_nsec) / 1000);
         if (latched_walltimestamps) {
           *walltimestamp = QuicWallTime::FromUNIXMicroseconds(usec);
         } else {
           *timestamp =
-              QuicTime::Zero().Add(QuicTime::Delta::FromMicroseconds(usec));
+              QuicTime::Zero() + QuicTime::Delta::FromMicroseconds(usec);
         }
       }
     }
   }
 }
 
 // static
 bool QuicSocketUtils::GetOverflowFromMsghdr(struct msghdr* hdr,
                                             QuicPacketCount* dropped_packets) {
   if (hdr->msg_controllen > 0) {
@@ skipping 239 matching lines @@
   rc = SetGetSoftwareReceiveTimestamp(fd);
   if (rc < 0) {
     LOG(WARNING) << "SO_TIMESTAMPING not supported; using fallback: "
                  << strerror(errno);
   }
 
   return fd;
 }
 
 }  // namespace net