Add more string16 variants.

R=brettw
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/304003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29440 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 38 insertions, 0 deletions

diff --git a/base/string_util.cc b/base/string_util.cc
index 5d15299..b0ab3a6 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -1301,6 +1301,14 @@ void SplitString(const std::wstring& str,
   SplitStringT(str, s, true, r);
 }
 
+#if !defined(WCHAR_T_IS_UTF16)
+void SplitString(const string16& str,
+                 char16 s,
+                 std::vector<string16>* r) {
+  SplitStringT(str, s, true, r);
+}
+#endif
+
 void SplitString(const std::string& str,
                  char s,
                  std::vector<std::string>* r) {
@@ -1313,6 +1321,14 @@ void SplitStringDontTrim(const std::wstring& str,
   SplitStringT(str, s, false, r);
 }
 
+#if !defined(WCHAR_T_IS_UTF16)
+void SplitStringDontTrim(const string16& str,
+                         char16 s,
+                         std::vector<string16>* r) {
+  SplitStringT(str, s, false, r);
+}
+#endif
+
 void SplitStringDontTrim(const std::string& str,
                          char s,
                          std::vector<std::string>* r) {
@@ -1340,6 +1356,12 @@ std::string JoinString(const std::vector<std::string>& parts, char sep) {
   return JoinStringT(parts, sep);
 }
 
+#if !defined(WCHAR_T_IS_UTF16)
+string16 JoinString(const std::vector<string16>& parts, char sep) {
+  return JoinStringT(parts, sep);
+}
+#endif
+
 std::wstring JoinString(const std::vector<std::wstring>& parts, wchar_t sep) {
   return JoinStringT(parts, sep);
 }
@@ -1389,6 +1411,13 @@ void SplitStringAlongWhitespace(const std::wstring& str,
   SplitStringAlongWhitespaceT(str, result);
 }
 
+#if !defined(WCHAR_T_IS_UTF16)
+void SplitStringAlongWhitespace(const string16& str,
+                                std::vector<string16>* result) {
+  SplitStringAlongWhitespaceT(str, result);
+}
+#endif
+
 void SplitStringAlongWhitespace(const std::string& str,
                                 std::vector<std::string>* result) {
   SplitStringAlongWhitespaceT(str, result);
diff --git a/base/string_util.h b/base/string_util.h
index f1eaa4e..6a69ad5 100644
--- a/base/string_util.h
+++ b/base/string_util.h
@@ -503,6 +503,9 @@ template<typename Char> struct CaseInsensitiveCompareASCII {
 void SplitString(const std::wstring& str,
                  wchar_t s,
                  std::vector<std::wstring>* r);
+void SplitString(const string16& str,
+                 char16 s,
+                 std::vector<string16>* r);
 void SplitString(const std::string& str,
                  char s,
                  std::vector<std::string>* r);
@@ -511,12 +514,16 @@ void SplitString(const std::string& str,
 void SplitStringDontTrim(const std::wstring& str,
                          wchar_t s,
                          std::vector<std::wstring>* r);
+void SplitStringDontTrim(const string16& str,
+                         char16 s,
+                         std::vector<string16>* r);
 void SplitStringDontTrim(const std::string& str,
                          char s,
                          std::vector<std::string>* r);
 
 // Does the opposite of SplitString().
 std::wstring JoinString(const std::vector<std::wstring>& parts, wchar_t s);
+string16 JoinString(const std::vector<string16>& parts, char16 s);
 std::string JoinString(const std::vector<std::string>& parts, char s);
 
 // WARNING: this uses whitespace as defined by the HTML5 spec. If you need
@@ -529,6 +536,8 @@ std::string JoinString(const std::vector<std::string>& parts, char s);
 // characters is added to result.
 void SplitStringAlongWhitespace(const std::wstring& str,
                                 std::vector<std::wstring>* result);
+void SplitStringAlongWhitespace(const string16& str,
+                                std::vector<string16>* result);
 void SplitStringAlongWhitespace(const std::string& str,
                                 std::vector<std::string>* result);