summaryrefslogtreecommitdiffstats
path: root/content/renderer/ico_image_decoder_unittest.cc
diff options
context:
space:
mode:
authorlushnikov@chromium.org <lushnikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-03 15:28:19 +0000
committerlushnikov@chromium.org <lushnikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-03 15:28:19 +0000
commit24f7d69b45211941e89c786f882a3f27d39a83a0 (patch)
treecdf0966bfe2ca08ec50adc476e3fcdebd373cfdc /content/renderer/ico_image_decoder_unittest.cc
parent97721e92dd28f00c67b3cbc161895665ffe28c14 (diff)
downloadchromium_src-24f7d69b45211941e89c786f882a3f27d39a83a0.zip
chromium_src-24f7d69b45211941e89c786f882a3f27d39a83a0.tar.gz
chromium_src-24f7d69b45211941e89c786f882a3f27d39a83a0.tar.bz2
disable ICOImageDecoderTest.Decoding on all platforms
BUG= TBR=vollick Review URL: https://codereview.chromium.org/15969011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/ico_image_decoder_unittest.cc')
-rw-r--r--content/renderer/ico_image_decoder_unittest.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc
index fca7393..7a68d5f 100644
--- a/content/renderer/ico_image_decoder_unittest.cc
+++ b/content/renderer/ico_image_decoder_unittest.cc
@@ -18,12 +18,7 @@ class ICOImageDecoderTest : public ImageDecoderTest {
}
};
-#if defined(OS_LINUX)
-#define MAYBE_Decoding DISABLED_Decoding
-#else
-#define MAYBE_Decoding Decoding
-#endif
-TEST_F(ICOImageDecoderTest, MAYBE_Decoding) {
+TEST_F(ICOImageDecoderTest, DISABLED_Decoding) {
TestDecoding();
}