Re-enable the ICO chunked decoding test. Remove check for condition that is ...

webkit/tools/test_shell/image_decoder_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
@@ skipping 136 matching lines @@
 
   if (split_at_random) {
     // Split the file at an arbitrary point.
     const int partial_size = static_cast<int>(
         (static_cast<double>(rand()) / RAND_MAX) * image_contents.size());
     shared_contents->append(image_contents.data(), partial_size);
 
     // 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(
         &image_contents.data()[partial_size],
         static_cast<int>(image_contents.size() - partial_size));
   } else {
     shared_contents->append(image_contents.data(),
                             static_cast<int>(image_contents.size()));
   }
 
@@ skipping 48 matching lines @@
       continue;
 
     if (ShouldImageFail(*i))
       continue;
 
     scoped_ptr<WebCore::ImageDecoder> decoder(SetupDecoder(*i, true));
     VerifyImage(decoder.get(), *i, GetMD5SumPath(*i), 0);
   }
 }
 #endif