From cf81d2d225d0288a91d4ae0d7e284c1b668623d4 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Tue, 10 May 2011 17:42:13 +0000 Subject: wstring: remove wstring version of TrimWhitespace And fix the one caller. BUG=23581 Review URL: http://codereview.chromium.org/6932056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84806 0039d316-1c4b-4281-b951-d872f2087c98 --- base/string_util.cc | 8 -------- base/string_util.h | 3 --- base/string_util_unittest.cc | 17 +++++++++-------- 3 files changed, 9 insertions(+), 19 deletions(-) (limited to 'base') diff --git a/base/string_util.cc b/base/string_util.cc index 1ad9abe..4a191b4 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -292,19 +292,11 @@ void TruncateUTF8ToByteSize(const std::string& input, output->clear(); } -TrimPositions TrimWhitespace(const std::wstring& input, - TrimPositions positions, - std::wstring* output) { - return TrimStringT(input, kWhitespaceWide, positions, output); -} - -#if !defined(WCHAR_T_IS_UTF16) TrimPositions TrimWhitespace(const string16& input, TrimPositions positions, string16* output) { return TrimStringT(input, kWhitespaceUTF16, positions, output); } -#endif TrimPositions TrimWhitespaceASCII(const std::string& input, TrimPositions positions, diff --git a/base/string_util.h b/base/string_util.h index 9864137..0b52ac0 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -221,9 +221,6 @@ enum TrimPositions { TRIM_TRAILING = 1 << 1, TRIM_ALL = TRIM_LEADING | TRIM_TRAILING, }; -BASE_API TrimPositions TrimWhitespace(const std::wstring& input, - TrimPositions positions, - std::wstring* output); BASE_API TrimPositions TrimWhitespace(const string16& input, TrimPositions positions, string16* output); diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc index cd45642..3731d4c 100644 --- a/base/string_util_unittest.cc +++ b/base/string_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -225,23 +225,24 @@ TEST(StringUtilTest, TruncateUTF8ToByteSize) { } TEST(StringUtilTest, TrimWhitespace) { - std::wstring output; // Allow contents to carry over to next testcase + string16 output; // Allow contents to carry over to next testcase for (size_t i = 0; i < arraysize(trim_cases); ++i) { const trim_case& value = trim_cases[i]; EXPECT_EQ(value.return_value, - TrimWhitespace(value.input, value.positions, &output)); - EXPECT_EQ(value.output, output); + TrimWhitespace(WideToUTF16(value.input), value.positions, + &output)); + EXPECT_EQ(WideToUTF16(value.output), output); } // Test that TrimWhitespace() can take the same string for input and output - output = L" This is a test \r\n"; + output = ASCIIToUTF16(" This is a test \r\n"); EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output)); - EXPECT_EQ(L"This is a test", output); + EXPECT_EQ(ASCIIToUTF16("This is a test"), output); // Once more, but with a string of whitespace - output = L" \r\n"; + output = ASCIIToUTF16(" \r\n"); EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output)); - EXPECT_EQ(L"", output); + EXPECT_EQ(ASCIIToUTF16(""), output); std::string output_ascii; for (size_t i = 0; i < arraysize(trim_cases_ascii); ++i) { -- cgit v1.1