Add SkEncodedFormat, used by SkCodec.

tests/PictureTest.cpp

Index: tests/PictureTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index ac750e9a85210c77a5935ba198ee3f3a10fb991c..da2db8e1e57dd0b29e62dff8f779e8c1be809e6a 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -838,7 +838,7 @@ public:
     bool onUseEncodedData(const void*, size_t) SK_OVERRIDE { return true; }
     SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
                            size_t rowBytes) SK_OVERRIDE {
-        return SkImageEncoder::EncodeData(info, pixels, rowBytes, SkImageEncoder::kPNG_Type, 100);
+        return SkImageEncoder::EncodeData(info, pixels, rowBytes, kPNG_SkEncodedFormat, 100);
     }
 };
 
@@ -876,7 +876,7 @@ static void test_bitmap_with_encoded_data(skiatest::Reporter* reporter) {
     SkBitmap original;
     make_bm(&original, 100, 100, SK_ColorBLUE, true);
     SkDynamicMemoryWStream wStream;
-    if (!SkImageEncoder::EncodeStream(&wStream, original, SkImageEncoder::kPNG_Type, 100)) {
+    if (!SkImageEncoder::EncodeStream(&wStream, original, kPNG_SkEncodedFormat, 100)) {
         return;
     }
     SkAutoDataUnref data(wStream.copyToData());