diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
| commit | 13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5 (patch) | |
| tree | ada8d64cbd2fd12c7248cca648e47ebd63e6462a /app/text_elider_unittest.cc | |
| parent | cd4857b64f3e3b10ebfa3f44c38af0dc7376d5bb (diff) | |
| download | chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.zip chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.gz chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.bz2 | |
Change Font.GetStringWidth() to take string16 instead of wstring.
do a bunch of string fixes along the way.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/5985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/text_elider_unittest.cc')
| -rw-r--r-- | app/text_elider_unittest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc index ab1a73f..7d0cbda 100644 --- a/app/text_elider_unittest.cc +++ b/app/text_elider_unittest.cc @@ -44,7 +44,8 @@ void RunTest(Testcase* testcases, size_t num_testcases) { // Should we test with non-empty language list? // That's kinda redundant with net_util_unittests. EXPECT_EQ(WideToUTF16(testcases[i].output), - ElideUrl(url, font, font.GetStringWidth(testcases[i].output), + ElideUrl(url, font, + font.GetStringWidth(WideToUTF16(testcases[i].output)), std::wstring())); } } @@ -183,7 +184,7 @@ TEST(TextEliderTest, TestFilenameEliding) { expected = base::i18n::GetDisplayStringInLTRDirectionality(expected); EXPECT_EQ(expected, ElideFilename(filepath, font, - font.GetStringWidth(testcases[i].output))); + font.GetStringWidth(WideToUTF16(testcases[i].output)))); } } @@ -212,14 +213,13 @@ TEST(TextEliderTest, ElideTextLongStrings) { }; const gfx::Font font; - int ellipsis_width = font.GetStringWidth(UTF16ToWideHack(kEllipsisStr)); + int ellipsis_width = font.GetStringWidth(kEllipsisStr); for (size_t i = 0; i < arraysize(testcases_end); ++i) { // Compare sizes rather than actual contents because if the test fails, // output is rather long. EXPECT_EQ(testcases_end[i].output.size(), ElideText(testcases_end[i].input, font, - font.GetStringWidth(UTF16ToWideHack( - testcases_end[i].output)), + font.GetStringWidth(testcases_end[i].output), false).size()); EXPECT_EQ(kEllipsisStr, ElideText(testcases_end[i].input, font, ellipsis_width, false)); @@ -243,8 +243,7 @@ TEST(TextEliderTest, ElideTextLongStrings) { // output is rather long. EXPECT_EQ(testcases_middle[i].output.size(), ElideText(testcases_middle[i].input, font, - font.GetStringWidth(UTF16ToWideHack( - testcases_middle[i].output)), + font.GetStringWidth(testcases_middle[i].output), false).size()); EXPECT_EQ(kEllipsisStr, ElideText(testcases_middle[i].input, font, ellipsis_width, |