SkEncoder: Rename files, change webp API, for consistency


Bug: skia:
Change-Id: I3dd6feb3d5661dcad3d2388b4d01fa9d3bbb15bb
Reviewed-on: https://skia-review.googlesource.com/15631
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 4303521..ffaeb2b 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -26,6 +26,7 @@
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
+#include "SkWebpEncoder.h"
 #include "Test.h"
 
 #include "png.h"
@@ -1529,9 +1530,9 @@
                           SkTransferFunctionBehavior unpremulBehavior,
                           SkEncodedImageFormat format) {
     SkPngEncoder::Options pngOptions;
-    SkEncodeOptions options;
+    SkWebpEncoder::Options webpOptions;
     pngOptions.fUnpremulBehavior = unpremulBehavior;
-    options.fUnpremulBehavior = unpremulBehavior;
+    webpOptions.fUnpremulBehavior = unpremulBehavior;
     switch (format) {
         case SkEncodedImageFormat::kPNG:
             SkPngEncoder::Encode(stream, pixmap, pngOptions);
@@ -1540,7 +1541,7 @@
             SkJpegEncoder::Encode(stream, pixmap, SkJpegEncoder::Options());
             break;
         case SkEncodedImageFormat::kWEBP:
-            SkEncodeImageAsWEBP(stream, pixmap, options);
+            SkWebpEncoder::Encode(stream, pixmap, webpOptions);
             break;
         default:
             SkASSERT(false);