Remove many-many SpdyMajorVersion and NextProto arguments and members.

net/spdy/header_coalescer.cc

 // Copyright (c) 2016 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/spdy/header_coalescer.h"
 
 #include "base/strings/string_util.h"
 
 namespace net {
 
@@ skipping 11 matching lines @@
   }
 
   // 32 byte overhead according to RFC 7540 Section 6.5.2.
   header_list_size_ += key.size() + value.size() + 32;
   if (header_list_size_ > kMaxHeaderListSize) {
     error_seen_ = true;
     return;
   }
 
   if (key[0] == ':') {
-    if (protocol_version_ == HTTP2 && regular_header_seen_) {
+    if (regular_header_seen_) {
       error_seen_ = true;
       return;
     }
   } else {
     regular_header_seen_ = true;
   }
 
   auto iter = headers_.find(key);
   if (iter == headers_.end()) {
     headers_[key] = value;
   } else {
     // This header had multiple values, so it must be reconstructed.
     base::StringPiece v = iter->second;
     std::string s(v.data(), v.length());
     if (key == "cookie") {
       // Obeys section 8.1.2.5 in RFC 7540 for cookie reconstruction.
       s.append("; ");
     } else {
       base::StringPiece("\0", 1).AppendToString(&s);
     }
     value.AppendToString(&s);
     headers_.ReplaceOrAppendHeader(key, s);
   }
 }
 
 }  // namespace net