summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 14:20:57 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 14:20:57 +0000
commite91a7d103a2bc6c7a4ba78822dcec45609a8f50e (patch)
treefa39e36e5998c5749e71106b655f23a53438f9b2 /app
parentc8421569872d0738907e56420415e4e07e67529b (diff)
downloadchromium_src-e91a7d103a2bc6c7a4ba78822dcec45609a8f50e.zip
chromium_src-e91a7d103a2bc6c7a4ba78822dcec45609a8f50e.tar.gz
chromium_src-e91a7d103a2bc6c7a4ba78822dcec45609a8f50e.tar.bz2
WebKit roll 54045:54059
Review URL: http://codereview.chromium.org/553147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/gfx/text_elider_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/gfx/text_elider_unittest.cc b/app/gfx/text_elider_unittest.cc
index f8ef035..385d92d 100644
--- a/app/gfx/text_elider_unittest.cc
+++ b/app/gfx/text_elider_unittest.cc
@@ -186,8 +186,7 @@ TEST(TextEliderTest, TestFilenameEliding) {
}
}
-// http://code.google.com/p/chromium/issues/detail?id=33489
-TEST(TextEliderTest, DISABLED_ElideTextLongStrings) {
+TEST(TextEliderTest, ElideTextLongStrings) {
const std::wstring kEllipsisStr(kEllipsis);
std::wstring data_scheme(L"data:text/plain,");