move SkImage::ColorType into SkColorType

tests/CachedDecodingPixelRefTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 37 matching lines @@
     }
     return NULL;
 }
 
 /**
  *  A simplified version of SkBitmapFactory
  */
 static bool simple_bitmap_factory(SkBitmapFactory::DecodeProc proc,
                                   SkData* data,
                                   SkBitmap* dst) {
-    SkImage::Info info;
+    SkImageInfo info;
     if (!proc(data->data(), data->size(), &info, NULL)) {
         return false;
     }
     dst->setConfig(SkImageInfoToBitmapConfig(info), info.fWidth,
                     info.fHeight, 0, info.fAlphaType);
     SkAutoTUnref<SkLazyPixelRef> ref(SkNEW_ARGS(SkLazyPixelRef,
                                                 (data, proc, NULL)));
     dst->setPixelRef(ref);
     return true;
 }
@@ skipping 125 matching lines @@
         //         // verify that *different* pixels are used this time.
         //         REPORTER_ASSERT(reporter, lazy.getPixels() != lazyPixels);
         //         compare_bitmaps(reporter, original, lazy, comparePixels);
         //     }
         // }
 
         // restore cache size
         SkScaledImageCache::SetByteLimit(oldByteLimit);
     }
 }