Make net::HttpRequestHeaders::AddHeadersFromString split on NL

net/http/http_request_headers.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/http/http_request_headers.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 99 matching lines @@
 }
 
 void HttpRequestHeaders::RemoveHeader(const base::StringPiece& key) {
   HeaderVector::iterator it = FindHeader(key);
   if (it != headers_.end())
     headers_.erase(it);
 }
 
 void HttpRequestHeaders::AddHeaderFromString(
     const base::StringPiece& header_line) {
-  DCHECK_EQ(std::string::npos, header_line.find("\r\n"))
+  DCHECK_EQ(std::string::npos, header_line.find_first_of("\r\n"))
       << "\"" << header_line << "\" contains CRLF.";
 
   const std::string::size_type key_end_index = header_line.find(":");
   if (key_end_index == std::string::npos) {
     LOG(DFATAL) << "\"" << header_line << "\" is missing colon delimiter.";
     return;
   }
 
   if (key_end_index == 0) {
     LOG(DFATAL) << "\"" << header_line << "\" is missing header key.";
@@ skipping 23 matching lines @@
     }
   } else if (value_index == header_line.size()) {
     SetHeader(header_key, "");
   } else {
     NOTREACHED();
   }
 }
 
 void HttpRequestHeaders::AddHeadersFromString(
     const base::StringPiece& headers) {
-  for (const base::StringPiece& header : base::SplitStringPieceUsingSubstr(
+  for (const base::StringPiece& header : base::SplitStringPiece(
            headers, "\r\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
     AddHeaderFromString(header);
   }
 }
 
 void HttpRequestHeaders::MergeFrom(const HttpRequestHeaders& other) {
   for (HeaderVector::const_iterator it = other.headers_.begin();
        it != other.headers_.end(); ++it ) {
     SetHeader(it->key, it->value);
   }
@@ skipping 78 matching lines @@
   for (HeaderVector::const_iterator it = headers_.begin();
        it != headers_.end(); ++it) {
     if (base::EqualsCaseInsensitiveASCII(key, it->key))
       return it;
   }
 
   return headers_.end();
 }
 
 }  // namespace net