diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 16:23:18 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 16:23:18 +0000 |
| commit | 70edb8606702fd26565cc46fd3075bfe75f68d97 (patch) | |
| tree | c2647cc5cd843c5abbc9c90bd6855bd8b0b7c674 /app/text_elider_unittest.cc | |
| parent | 05672cafff847dc3beb0e29e1506bee6a5a7447e (diff) | |
| download | chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.zip chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.gz chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.bz2 | |
Convert GetDisplayStringInLTRDirectionality from wstring to string16.
BUG=23581
Review URL: http://codereview.chromium.org/3108027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/text_elider_unittest.cc')
| -rw-r--r-- | app/text_elider_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc index 627c556..2dd76e2 100644 --- a/app/text_elider_unittest.cc +++ b/app/text_elider_unittest.cc @@ -7,6 +7,7 @@ #include "base/i18n/rtl.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "gfx/font.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -178,11 +179,11 @@ TEST(TextEliderTest, TestFilenameEliding) { static const gfx::Font font; for (size_t i = 0; i < arraysize(testcases); ++i) { FilePath filepath(testcases[i].input); - std::wstring expected = testcases[i].output; - base::i18n::GetDisplayStringInLTRDirectionality(&expected); - EXPECT_EQ(expected, ElideFilename(filepath, + string16 expected = WideToUTF16(testcases[i].output); + expected = base::i18n::GetDisplayStringInLTRDirectionality(expected); + EXPECT_EQ(expected, WideToUTF16(ElideFilename(filepath, font, - font.GetStringWidth(testcases[i].output))); + font.GetStringWidth(testcases[i].output)))); } } |