summaryrefslogtreecommitdiffstats
path: root/app/text_elider_unittest.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 21:47:48 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 21:47:48 +0000
commit25de8d0c1874566511d42d4e46276507bb88ce16 (patch)
treefda12f19796cd23765a87f4e1402e3758aa9ce9c /app/text_elider_unittest.cc
parentd1e7881403dd7f9fa28292beb38f0d6e01a7e3c0 (diff)
downloadchromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.zip
chromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.tar.gz
chromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.tar.bz2
Convert ElideUrl to return a string16 instead of a wstring.
BUG=23581 Review URL: http://codereview.chromium.org/4115003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/text_elider_unittest.cc')
-rw-r--r--app/text_elider_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc
index cc65165..8bb224c 100644
--- a/app/text_elider_unittest.cc
+++ b/app/text_elider_unittest.cc
@@ -43,7 +43,7 @@ void RunTest(Testcase* testcases, size_t num_testcases) {
const GURL url(testcases[i].input);
// Should we test with non-empty language list?
// That's kinda redundant with net_util_unittests.
- EXPECT_EQ(testcases[i].output,
+ EXPECT_EQ(WideToUTF16(testcases[i].output),
ElideUrl(url, font, font.GetStringWidth(testcases[i].output),
std::wstring()));
}