Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1713)

Unified Diff: base/string_util_unittest.cc

Issue 8687002: Cleanup: Convert ASCIIToUTF16("") to string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/string_piece_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/string_util_unittest.cc
diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc
index ecdb84f20d9b1a1d8076a3882b4bd0eab1b64a2a..1ffc59b17e2613afc4ce4f65530e9f06f15d4e4f 100644
--- a/base/string_util_unittest.cc
+++ b/base/string_util_unittest.cc
@@ -9,6 +9,7 @@
#include <sstream>
#include "base/basictypes.h"
+#include "base/string16.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -242,7 +243,7 @@ TEST(StringUtilTest, TrimWhitespace) {
// Once more, but with a string of whitespace
output = ASCIIToUTF16(" \r\n");
EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output));
- EXPECT_EQ(ASCIIToUTF16(""), output);
+ EXPECT_EQ(string16(), output);
std::string output_ascii;
for (size_t i = 0; i < arraysize(trim_cases_ascii); ++i) {
@@ -327,7 +328,7 @@ TEST(StringUtilTest, ContainsOnlyWhitespaceASCII) {
}
TEST(StringUtilTest, ContainsOnlyWhitespace) {
- EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("")));
+ EXPECT_TRUE(ContainsOnlyWhitespace(string16()));
EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16(" ")));
EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("\t")));
EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("\t \r \n ")));
« no previous file with comments | « base/string_piece_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698