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