New new versions of Starts/EndsWith and SplitString in net

net/tools/quic/quic_simple_client_bin.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.
 
 // A binary wrapper for QuicClient.
 // Connects to a host using QUIC, sends a request to the provided URL, and
 // displays the response.
 //
 // Some usage examples:
 //
@@ skipping 224 matching lines @@
 
   // Append any additional headers supplied on the command line.
   vector<string> headers_tokenized;
   Tokenize(FLAGS_headers, ";", &headers_tokenized);
   for (size_t i = 0; i < headers_tokenized.size(); ++i) {
     string sp;
     base::TrimWhitespaceASCII(headers_tokenized[i], base::TRIM_ALL, &sp);
     if (sp.empty()) {
       continue;
     }
-    vector<string> kv;
-    base::SplitString(sp, ':', &kv);
+    vector<string> kv =
+        base::SplitString(sp, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     CHECK_EQ(2u, kv.size());
     string key;
     base::TrimWhitespaceASCII(kv[0], base::TRIM_ALL, &key);
     string value;
     base::TrimWhitespaceASCII(kv[1], base::TRIM_ALL, &value);
     request.extra_headers.SetHeader(key, value);
   }
 
   // Make sure to store the response, for later output.
   client.set_store_response(true);
@@ skipping 29 matching lines @@
       return 0;
     } else {
       cout << "Request failed (redirect " << response_code << ")." << endl;
       return 1;
     }
   } else {
     cerr << "Request failed (" << response_code << ")." << endl;
     return 1;
   }
 }