Cleanup SplitStringIntoKeyaluePairs implementation.

base/strings/string_split.h

 // 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.
 
 #ifndef BASE_STRINGS_STRING_SPLIT_H_
 #define BASE_STRINGS_STRING_SPLIT_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base_export.h"
 #include "base/strings/string16.h"
 
 namespace base {
 
 // Splits |str| into a vector of strings delimited by |c|, placing the results
 // in |r|. If several instances of |c| are contiguous, or if |str| begins with
 // or ends with |c|, then an empty string is inserted.
 //
 // Every substring is trimmed of any leading or trailing white space.
 // NOTE: |c| must be in BMP (Basic Multilingual Plane)
 BASE_EXPORT void SplitString(const string16& str,
                              char16 c,
                              std::vector<string16>* r);
+
 // |str| should not be in a multi-byte encoding like Shift-JIS or GBK in which
 // the trailing byte of a multi-byte character can be in the ASCII range.
 // UTF-8, and other single/multi-byte ASCII-compatible encodings are OK.
 // Note: |c| must be in the ASCII range.
 BASE_EXPORT void SplitString(const std::string& str,
                              char c,
                              std::vector<std::string>* r);
 
-BASE_EXPORT bool SplitStringIntoKeyValues(const std::string& line,

[Mark Mentovai, 2014/03/06 17:55:51]

The CL description should say that this is going away.

[pneubeck (no reviews), 2014/03/07 17:12:11]

Done.

-                                          char key_value_delimiter,
-                                          std::string* key,
-                                          std::vector<std::string>* values);
+typedef std::vector<std::pair<std::string, std::string> > StringPairs;
 
-typedef std::vector<std::pair<std::string, std::string> > StringPairs;;
-
-BASE_EXPORT bool SplitStringIntoKeyValuePairs(
-    const std::string& line,
-    char key_value_delimiter,
-    char key_value_pair_delimiter,
-    StringPairs* key_value_pairs);
+// Splits |line| into key value pairs according to the given delimiters and
+// removes whitespace leading each key and trailing each value. Returns true
+// only if each pair has a non-empty key and value. |key_value_pairs| will
+// include ("","") pairs for entries without |key_value_delimiter|.
+BASE_EXPORT bool SplitStringIntoKeyValuePairs(const std::string& line,
+                                              char key_value_delimiter,
+                                              char key_value_pair_delimiter,
+                                              StringPairs* key_value_pairs);
 
 // The same as SplitString, but use a substring delimiter instead of a char.
 BASE_EXPORT void SplitStringUsingSubstr(const string16& str,
                                         const string16& s,
                                         std::vector<string16>* r);
 BASE_EXPORT void SplitStringUsingSubstr(const std::string& str,
                                         const std::string& s,
                                         std::vector<std::string>* r);
 
 // The same as SplitString, but don't trim white space.
@@ skipping 18 matching lines @@
 // characters defined by HTML 5). Each contiguous block of non-whitespace
 // characters is added to result.
 BASE_EXPORT void SplitStringAlongWhitespace(const string16& str,
                                             std::vector<string16>* result);
 BASE_EXPORT void SplitStringAlongWhitespace(const std::string& str,
                                             std::vector<std::string>* result);
 
 }  // namespace base
 
 #endif  // BASE_STRINGS_STRING_SPLIT_H_