diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 23:00:42 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 23:00:42 +0000 |
commit | 84a761ee5394832fe52e3bba7e158d94254d3709 (patch) | |
tree | 2adb2981f3c8899c34c81b773a92e165321e623a /app/text_elider_unittest.cc | |
parent | 05f0f9d02bf3c8124f68abd3446c9a981ec51913 (diff) | |
download | chromium_src-84a761ee5394832fe52e3bba7e158d94254d3709.zip chromium_src-84a761ee5394832fe52e3bba7e158d94254d3709.tar.gz chromium_src-84a761ee5394832fe52e3bba7e158d94254d3709.tar.bz2 |
Convert ElideFilename from using wstring to string16.
Some small cleanups of wstring::npos usage.
BUG=23581
Review URL: http://codereview.chromium.org/3390035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/text_elider_unittest.cc')
-rw-r--r-- | app/text_elider_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc index 2dd76e2..174be59 100644 --- a/app/text_elider_unittest.cc +++ b/app/text_elider_unittest.cc @@ -181,9 +181,9 @@ TEST(TextEliderTest, TestFilenameEliding) { FilePath filepath(testcases[i].input); string16 expected = WideToUTF16(testcases[i].output); expected = base::i18n::GetDisplayStringInLTRDirectionality(expected); - EXPECT_EQ(expected, WideToUTF16(ElideFilename(filepath, + EXPECT_EQ(expected, ElideFilename(filepath, font, - font.GetStringWidth(testcases[i].output)))); + font.GetStringWidth(testcases[i].output))); } } |