Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

net/quic/quic_headers_stream.cc

 // Copyright 2013 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/quic/quic_headers_stream.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_headers_stream.h"
@@ skipping 271 matching lines @@
     if (measure_headers_hol_blocking_time_) {
       if (prev_max_timestamp_ > cur_max_timestamp_) {
         // prev_max_timestamp_ > cur_max_timestamp_ implies that
         // 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_));
         DVLOG(1) << "stream " << stream_id
                  << ": Net.QuicSession.HeadersHOLBlockedTime "
                  << delta.ToMilliseconds();
-        UMA_HISTOGRAM_TIMES(
-            "Net.QuicSession.HeadersHOLBlockedTime",
-            base::TimeDelta::FromMicroseconds(delta.ToMicroseconds()));
+        spdy_session_->OnHeadersHeadOfLineBlocking(delta);
       }
       prev_max_timestamp_ = std::max(prev_max_timestamp_, cur_max_timestamp_);
       cur_max_timestamp_ = QuicTime::Zero();
     }
     spdy_session_->OnStreamHeadersComplete(stream_id_, fin_, frame_len_);
     // Reset state for the next frame.
     stream_id_ = kInvalidStreamId;
     fin_ = false;
     frame_len_ = 0;
   } else {
     spdy_session_->OnStreamHeaders(stream_id_, StringPiece(header_data, len));
   }
 }
 
 void QuicHeadersStream::OnCompressedFrameSize(size_t frame_len) {
   frame_len_ += frame_len;
 }
 
 bool QuicHeadersStream::IsConnected() {
   return session()->connection()->connected();
 }
 
 }  // namespace net