Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

services/http_server/http_request_parser.cc

 // Copyright 2014 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 "services/http_server/http_request_parser.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 61 matching lines @@
 
 HttpRequestParser::ParseResult HttpRequestParser::ParseHeaders() {
   // Check if the all request headers are available.
   if (buffer_.find("\r\n\r\n", buffer_position_) == std::string::npos)
     return WAITING;
 
   // Parse request's the first header line.
   // Request main main header, eg. GET /foobar.html HTTP/1.1
   {
     const std::string header_line = ShiftLine();
-    std::vector<std::string> header_line_tokens;
-    base::SplitString(header_line, ' ', &header_line_tokens);
+    std::vector<std::string> header_line_tokens = base::SplitString(
+        header_line, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     DCHECK_EQ(3u, header_line_tokens.size());
     // Method.
     http_request_->method = header_line_tokens[0];
     // Address.
     // Don't build an absolute URL as the parser does not know (should not
     // know) anything about the server address.
     http_request_->relative_url = header_line_tokens[1];
     // Protocol.
-    const std::string protocol =
-        base::StringToLowerASCII(header_line_tokens[2]);
+    const std::string protocol = base::ToLowerASCII(header_line_tokens[2]);
     CHECK(protocol == "http/1.0" || protocol == "http/1.1") <<
         "Protocol not supported: " << protocol;
   }
 
   // Parse further headers.
   {
     std::string header_name;
     while (true) {
       std::string header_line = ShiftLine();
       if (header_line.empty())
@@ skipping 77 matching lines @@
   state_ = STATE_CONTENT;
   return WAITING;
 }
 
 HttpRequestPtr HttpRequestParser::GetRequest() {
   DCHECK_EQ(STATE_ACCEPTED, state_);
   return http_request_.Pass();
 }
 
 }  // namespace http_server