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

net/quic/quic_headers_stream.cc

Index: net/quic/quic_headers_stream.cc
diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc
index 75ef2c7d1c321730c7cb2d13b4c5d7da12545b52..fc56faf23c0c3e528c8a79039634fb925132f324 100644
--- a/net/quic/quic_headers_stream.cc
+++ b/net/quic/quic_headers_stream.cc
@@ -35,14 +35,14 @@ class HeaderTableDebugVisitor : public HpackHeaderTable::DebugVisitorInterface {
 
   int64_t OnNewEntry(const HpackEntry& entry) override {
     DVLOG(1) << entry.GetDebugString();
-    return clock_->ApproximateNow().Subtract(QuicTime::Zero()).ToMicroseconds();
+    return (clock_->ApproximateNow() - QuicTime::Zero()).ToMicroseconds();
   }
 
   void OnUseEntry(const HpackEntry& entry) override {
     const QuicTime::Delta elapsed(
-        clock_->ApproximateNow()
-            .Subtract(QuicTime::Delta::FromMicroseconds(entry.time_added()))
-            .Subtract(QuicTime::Zero()));
+        clock_->ApproximateNow() -
+        QuicTime::Delta::FromMicroseconds(entry.time_added()) -
+        QuicTime::Zero());
     DVLOG(1) << entry.GetDebugString() << " " << elapsed.ToMilliseconds()
              << " ms";
     headers_stream_hpack_visitor_->OnUseEntry(elapsed);
@@ -508,7 +508,7 @@ void QuicHeadersStream::OnControlFrameHeaderData(SpdyStreamId stream_id,
         // headers from lower numbered streams actually came off the
         // wire after headers for the current stream, hence there was
         // HOL blocking.
-        QuicTime::Delta delta(prev_max_timestamp_.Subtract(cur_max_timestamp_));
+        QuicTime::Delta delta = prev_max_timestamp_ - cur_max_timestamp_;
         DVLOG(1) << "stream " << stream_id
                  << ": Net.QuicSession.HeadersHOLBlockedTime "
                  << delta.ToMilliseconds();
@@ -555,7 +555,7 @@ void QuicHeadersStream::OnHeaderList(const QuicHeaderList& header_list) {
       // headers from lower numbered streams actually came off the
       // wire after headers for the current stream, hence there was
       // HOL blocking.
-      QuicTime::Delta delta = prev_max_timestamp_.Subtract(cur_max_timestamp_);
+      QuicTime::Delta delta = prev_max_timestamp_ - cur_max_timestamp_;
       DVLOG(1) << "stream " << stream_id_
                << ": Net.QuicSession.HeadersHOLBlockedTime "
                << delta.ToMilliseconds();