Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/tools/quic/quic_spdy_client_stream.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_spdy_client_stream.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 39 matching lines @@
   DCHECK(headers_decompressed());
   header_bytes_read_ += frame_len;
   if (!SpdyUtils::ParseHeaders(decompressed_headers().data(),
                                decompressed_headers().length(),
                                &content_length_, &response_headers_)) {
     DLOG(ERROR) << "Failed to parse headers: " << decompressed_headers();
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
 
-  if (!ParseHeaderStatusCode(&response_headers_, &response_code_)) {
+  if (!ParseHeaderStatusCode(response_headers_, &response_code_)) {
     DLOG(ERROR) << "Received invalid response code: "
                 << response_headers_[":status"].as_string();
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
 
   MarkHeadersConsumed(decompressed_headers().length());
   DVLOG(1) << "headers complete for stream " << id();
 
   session_->OnInitialHeadersComplete(id(), response_headers_);
 }
 
 void QuicSpdyClientStream::OnInitialHeadersComplete(
     bool fin,
     size_t frame_len,
     const QuicHeaderList& header_list) {
   QuicSpdyStream::OnInitialHeadersComplete(fin, frame_len, header_list);
 
   DCHECK(headers_decompressed());
   header_bytes_read_ += frame_len;
   if (!SpdyUtils::CopyAndValidateHeaders(header_list, &content_length_,
                                          &response_headers_)) {
     DLOG(ERROR) << "Failed to parse header list: " << header_list.DebugString();
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
 
-  if (!ParseHeaderStatusCode(&response_headers_, &response_code_)) {
+  if (!ParseHeaderStatusCode(response_headers_, &response_code_)) {
     DLOG(ERROR) << "Received invalid response code: "
                 << response_headers_[":status"].as_string();
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
 
   ConsumeHeaderList();
   DVLOG(1) << "headers complete for stream " << id();
 
   session_->OnInitialHeadersComplete(id(), response_headers_);
@@ skipping 93 matching lines @@
   bytes_sent += header_bytes_written_;
 
   if (!body.empty()) {
     WriteOrBufferData(body, fin, nullptr);
   }
 
   return bytes_sent;
 }
 
 }  // namespace net