Add SkEncodedFormat, used by SkCodec.

tests/PathOpsSkpClipTest.cpp

 #include "CrashHandler.h"
 // #include "OverwriteLine.h"
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
@@ skipping 408 matching lines @@
     }
     pic->playback(canvas);
     if (scale != 1) {
         canvas->restore();
     }
 }
 
 static void writePict(const SkBitmap& bitmap, const char* outDir, const char* pngName) {
     SkString outFile = get_sum_path(outDir);
     outFile.appendf("%s%s", PATH_SLASH, pngName);
-    if (!SkImageEncoder::EncodeFile(outFile.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100)) {
+    if (!SkImageEncoder::EncodeFile(outFile.c_str(), bitmap, kPNG_SkEncodedFormat, 100)) {
         SkDebugf("unable to encode gr %s (width=%d height=%d)\n", pngName,
                     bitmap.width(), bitmap.height());
     }
 }
 
 void TestResult::testOne() {
     SkPicture* pic = NULL;
     {
     #if DEBUG_SHOW_TEST_NAME
         if (fTestStep == kCompareBits) {
@@ skipping 657 matching lines @@
     }
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif