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

net/tools/quic/quic_epoll_clock.cc

Index: net/tools/quic/quic_epoll_clock.cc
diff --git a/net/tools/quic/quic_epoll_clock.cc b/net/tools/quic/quic_epoll_clock.cc
index cb7717647b79de918db6321f1f0879b0b3338e37..357bc500c63967eb839978218f59d368141dd367 100644
--- a/net/tools/quic/quic_epoll_clock.cc
+++ b/net/tools/quic/quic_epoll_clock.cc
@@ -14,13 +14,13 @@ QuicEpollClock::QuicEpollClock(EpollServer* epoll_server)
 QuicEpollClock::~QuicEpollClock() {}
 
 QuicTime QuicEpollClock::ApproximateNow() const {
-  return QuicTime::Zero().Add(
-      QuicTime::Delta::FromMicroseconds(epoll_server_->ApproximateNowInUsec()));
+  return QuicTime::Zero() + QuicTime::Delta::FromMicroseconds(
+                                epoll_server_->ApproximateNowInUsec());
 }
 
 QuicTime QuicEpollClock::Now() const {
-  return QuicTime::Zero().Add(
-      QuicTime::Delta::FromMicroseconds(epoll_server_->NowInUsec()));
+  return QuicTime::Zero() +
+         QuicTime::Delta::FromMicroseconds(epoll_server_->NowInUsec());
 }
 
 QuicWallTime QuicEpollClock::WallNow() const {
@@ -30,8 +30,8 @@ QuicWallTime QuicEpollClock::WallNow() const {
 
 QuicTime QuicEpollClock::ConvertWallTimeToQuicTime(
     const QuicWallTime& walltime) const {
-  return QuicTime::Zero().Add(
-      QuicTime::Delta::FromMicroseconds(walltime.ToUNIXMicroseconds()));
-};
+  return QuicTime::Zero() +
+         QuicTime::Delta::FromMicroseconds(walltime.ToUNIXMicroseconds());
+}
 
 }  // namespace net