Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1717)

Unified Diff: content/renderer/ico_image_decoder_unittest.cc

Issue 15927007: Disable ico_image_decoder_unittest until the bad patch will be rolled out in blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/ico_image_decoder_unittest.cc
diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc
index 7e1e01e52d9a1f3685a57f419d4cfaae1e568708..fca7393ae6b771a0579587966f4594008dfdcc59 100644
--- a/content/renderer/ico_image_decoder_unittest.cc
+++ b/content/renderer/ico_image_decoder_unittest.cc
@@ -18,7 +18,12 @@ class ICOImageDecoderTest : public ImageDecoderTest {
}
};
-TEST_F(ICOImageDecoderTest, Decoding) {
+#if defined(OS_LINUX)
+#define MAYBE_Decoding DISABLED_Decoding
+#else
+#define MAYBE_Decoding Decoding
+#endif
+TEST_F(ICOImageDecoderTest, MAYBE_Decoding) {
TestDecoding();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698