| Index: base/strings/string_util.cc
|
| diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc
|
| index 4b102c58ea7ceb4c75cb8232f635c97c32ee2e5c..c2e0e8a17cfb2eaf5c0576d08e386aced8a3c93d 100644
|
| --- a/base/strings/string_util.cc
|
| +++ b/base/strings/string_util.cc
|
| @@ -242,18 +242,16 @@ void TruncateUTF8ToByteSize(const std::string& input,
|
| output->clear();
|
| }
|
|
|
| -} // namespace base
|
| -
|
| -TrimPositions TrimWhitespace(const base::string16& input,
|
| +TrimPositions TrimWhitespace(const string16& input,
|
| TrimPositions positions,
|
| - base::string16* output) {
|
| - return base::TrimStringT(input, base::kWhitespaceUTF16, positions, output);
|
| + string16* output) {
|
| + return TrimStringT(input, kWhitespaceUTF16, positions, output);
|
| }
|
|
|
| TrimPositions TrimWhitespaceASCII(const std::string& input,
|
| TrimPositions positions,
|
| std::string* output) {
|
| - return base::TrimStringT(input, base::kWhitespaceASCII, positions, output);
|
| + return TrimStringT(input, kWhitespaceASCII, positions, output);
|
| }
|
|
|
| // This function is only for backward-compatibility.
|
| @@ -264,6 +262,8 @@ TrimPositions TrimWhitespace(const std::string& input,
|
| return TrimWhitespaceASCII(input, positions, output);
|
| }
|
|
|
| +} // namespace base
|
| +
|
| template<typename STR>
|
| STR CollapseWhitespaceT(const STR& text,
|
| bool trim_sequences_with_line_breaks) {
|
|
|