Pull HTTP/2 header parsing into utility method, from QuicSpdy{Client,Server}Streams. Not used in pr…

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 "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/spdy_utils.h"
@@ skipping 26 matching lines @@
              << "Aborting request.";
     CloseWriteSide();
   }
   QuicSpdyStream::OnStreamFrame(frame);
 }
 
 void QuicSpdyClientStream::OnStreamHeadersComplete(bool fin,
                                                    size_t frame_len) {
   header_bytes_read_ = frame_len;
   QuicSpdyStream::OnStreamHeadersComplete(fin, frame_len);
-  if (!ParseResponseHeaders(decompressed_headers().data(),
-                            decompressed_headers().length())) {
+  if (!SpdyUtils::ParseHeaders(decompressed_headers().data(),
+                               decompressed_headers().length(),
+                               &content_length_, &response_headers_)) {
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
+
+  string status = response_headers_[":status"].as_string();
+  size_t end = status.find(" ");
+  if (end != string::npos) {
+    status.erase(end);
+  }
+  if (!StringToInt(status, &response_code_)) {
+    // Invalid response code.
+    Reset(QUIC_BAD_APPLICATION_PAYLOAD);
+    return;
+  }
+
   MarkHeadersConsumed(decompressed_headers().length());
 }
 
 void QuicSpdyClientStream::OnDataAvailable() {
   while (HasBytesToRead()) {
     struct iovec iov;
     if (GetReadableRegions(&iov, 1) == 0) {
       // No more data to read.
       break;
     }
     DVLOG(1) << "Client processed " << iov.iov_len << " bytes for stream "
              << id();
     data_.append(static_cast<char*>(iov.iov_base), iov.iov_len);
 
     if (content_length_ >= 0 &&
         static_cast<int>(data_.size()) > content_length_) {
       Reset(QUIC_BAD_APPLICATION_PAYLOAD);
       return;
     }
     MarkConsumed(iov.iov_len);
   }
   if (sequencer()->IsClosed()) {
     OnFinRead();
   } else {
     sequencer()->SetUnblocked();
   }
 }
 
-bool QuicSpdyClientStream::ParseResponseHeaders(const char* data,
-                                                uint32 data_len) {
-  DCHECK(headers_decompressed());
-  SpdyFramer framer(HTTP2);
-  if (!framer.ParseHeaderBlockInBuffer(data, data_len, &response_headers_) ||
-      response_headers_.empty()) {
-    return false;  // Headers were invalid.
-  }
-
-  if (ContainsKey(response_headers_, "content-length") &&
-      !StringToInt(StringPiece(response_headers_["content-length"]),
-                   &content_length_)) {
-    return false;  // Invalid content-length.
-  }
-  string status = response_headers_[":status"].as_string();
-  size_t end = status.find(" ");
-  if (end != string::npos) {
-    status.erase(end);
-  }
-  if (!StringToInt(status, &response_code_)) {
-    return false;  // Invalid response code.
-  }
-  return true;
-}
-
 size_t QuicSpdyClientStream::SendRequest(const SpdyHeaderBlock& headers,
                                          StringPiece body,
                                          bool fin) {
   bool send_fin_with_headers = fin && body.empty();
   size_t bytes_sent = body.size();
   header_bytes_written_ =
       WriteHeaders(headers, send_fin_with_headers, nullptr);
   bytes_sent += header_bytes_written_;
 
   if (!body.empty()) {
     WriteOrBufferData(body, fin, nullptr);
   }
 
   return bytes_sent;
 }
 
 void QuicSpdyClientStream::SendBody(const string& data, bool fin) {
   SendBody(data, fin, nullptr);
 }
 
 void QuicSpdyClientStream::SendBody(const string& data,
                                     bool fin,
                                     QuicAckListenerInterface* listener) {
   WriteOrBufferData(data, fin, listener);
 }
 
 }  // namespace tools
 }  // namespace net