Re-enable the ICO chunked decoding test. Remove check for condition that is not an invariant. I thought it was when writing the test, but after some perusal of the decoders and thought, I think the GIF and ICO decoders both can legitimately fail this condition sometimes.

BUG=19263
TEST=none
Review URL: http://codereview.chromium.org/164506

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23351 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 3 deletions

diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc
index ddb9b03..0c73ebd 100644
--- a/webkit/tools/test_shell/image_decoder_unittest.cc
+++ b/webkit/tools/test_shell/image_decoder_unittest.cc
@@ -154,9 +154,10 @@ WebCore::ImageDecoder* ImageDecoderTest::SetupDecoder(
     // Make sure the image decoder doesn't fail when we ask for the frame buffer
     // for this partial image.
     decoder->setData(shared_contents.get(), false);
-    EXPECT_NE(static_cast<WebCore::RGBA32Buffer*>(NULL),
-              decoder->frameBufferAtIndex(0)) << path;
     EXPECT_FALSE(decoder->failed()) << path;
+    // NOTE: We can't check that frame 0 is non-NULL, because if this is an ICO
+    // and we haven't yet supplied enough data to read the directory, there is
+    // no framecount and thus no first frame.
 
     // Make sure passing the complete image results in successful decoding.
     shared_contents->append(
diff --git a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
index 4304424..0203ddf 100644
--- a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
@@ -50,7 +50,7 @@ TEST_F(ICOImageDecoderTest, Decoding) {
 }
 
 #ifndef CALCULATE_MD5_SUMS
-TEST_F(ICOImageDecoderTest, DISABLED_ChunkedDecoding) {
+TEST_F(ICOImageDecoderTest, ChunkedDecoding) {
   TestChunkedDecoding();
 }
 #endif