diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 00:49:16 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 00:49:16 +0000 |
commit | 7f23bac00f99429e34198b12322c11de3097e0ae (patch) | |
tree | d6d5994d06ed4aaa1b11aa3bcaf55ebaa2fdcaa8 /ui/base/text/text_elider_unittest.cc | |
parent | b852b07bce576b50aae75cbdc6ebf8c53d226c7f (diff) | |
download | chromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.zip chromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.tar.gz chromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.tar.bz2 |
Remove wstrings from ui/base/text_elider.h functions.
The last param is for languages, which is already a std::string in
most places.
BUG=23581
Review URL: http://codereview.chromium.org/6627061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/text/text_elider_unittest.cc')
-rw-r--r-- | ui/base/text/text_elider_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc index 57e0d40..933cc5f 100644 --- a/ui/base/text/text_elider_unittest.cc +++ b/ui/base/text/text_elider_unittest.cc @@ -49,7 +49,7 @@ void RunTest(Testcase* testcases, size_t num_testcases) { EXPECT_EQ(UTF8ToUTF16(testcases[i].output), ElideUrl(url, font, font.GetStringWidth(UTF8ToUTF16(testcases[i].output)), - std::wstring())); + std::string())); } } @@ -256,7 +256,7 @@ TEST(TextEliderTest, ElideTextLongStrings) { // Verifies display_url is set correctly. TEST(TextEliderTest, SortedDisplayURL) { - ui::SortedDisplayURL d_url(GURL("http://www.google.com"), std::wstring()); + ui::SortedDisplayURL d_url(GURL("http://www.google.com"), std::string()); EXPECT_EQ("www.google.com", UTF16ToASCII(d_url.display_url())); } @@ -291,8 +291,8 @@ TEST(TextEliderTest, SortedDisplayURLCompare) { }; for (size_t i = 0; i < arraysize(tests); ++i) { - ui::SortedDisplayURL url1(GURL(tests[i].a), std::wstring()); - ui::SortedDisplayURL url2(GURL(tests[i].b), std::wstring()); + ui::SortedDisplayURL url1(GURL(tests[i].a), std::string()); + ui::SortedDisplayURL url2(GURL(tests[i].b), std::string()); EXPECT_EQ(tests[i].compare_result, url1.Compare(url2, collator.get())); EXPECT_EQ(-tests[i].compare_result, url2.Compare(url1, collator.get())); } |