SkBitmap now really stores SkImageInfo -- config is just a ruse

tests/PixelRefTest.cpp

 #include "Test.h"
 
 #include "SkMallocPixelRef.h"
 #include "SkPixelRef.h"
 
 static void test_info(skiatest::Reporter* reporter) {
     static const struct {
         SkBitmap::Config    fConfig;
         SkAlphaType         fAlphaType;
         SkColorType         fExpectedColorType;
@@ skipping 12 matching lines @@
     };
 
     SkBitmap bitmap;
     SkImageInfo info;
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
         bool success = bitmap.setConfig(gRec[i].fConfig, 10, 10, 0, gRec[i].fAlphaType);
         REPORTER_ASSERT(reporter, success);
         success = bitmap.asImageInfo(&info);
         REPORTER_ASSERT(reporter, success == gRec[i].fExpectedSuccess);
-        if (gRec[i].fExpectedSuccess) {
+        if (success && gRec[i].fExpectedSuccess) {
             REPORTER_ASSERT(reporter, info.fAlphaType == gRec[i].fAlphaType);
             REPORTER_ASSERT(reporter, info.fColorType == gRec[i].fExpectedColorType);
         }
     }
 }
 
 class TestListener : public SkPixelRef::GenIDChangeListener {
 public:
     explicit TestListener(int* ptr) : fPtr(ptr) {}
     virtual void onChange() SK_OVERRIDE { (*fPtr)++; }
@@ skipping 29 matching lines @@
     pixelRef->notifyPixelsChanged();
     REPORTER_ASSERT(r, 1 == count);
 
     // Quick check that NULL is safe.
     REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID());
     pixelRef->addGenIDChangeListener(NULL);
     pixelRef->notifyPixelsChanged();
 
     test_info(r);
 }