Remove SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS

tests/CachedDecodingPixelRefTest.cpp

Index: tests/CachedDecodingPixelRefTest.cpp
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 78adc34d5ab4821aa71cbb930686d19af296751b..0e9b18e1cf4efb1f8e2ae4815765ac9974fd5cc6 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -182,29 +182,15 @@ protected:
                                     kOpaque_SkAlphaType);
     }
 
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-    Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                       const Options&,
-                       SkPMColor ctable[], int* ctableCount) override {
-#else
     bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                      SkPMColor ctable[], int* ctableCount) override {
-#endif
         REPORTER_ASSERT(fReporter, pixels != NULL);
         REPORTER_ASSERT(fReporter, rowBytes >= info.minRowBytes());
         if (fType != kSucceedGetPixels_TestType) {
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-            return kUnimplemented;
-#else
             return false;
-#endif
         }
         if (info.colorType() != kN32_SkColorType) {
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-            return kInvalidConversion;
-#else
             return false;
-#endif
         }
         char* bytePtr = static_cast<char*>(pixels);
         for (int y = 0; y < info.height(); ++y) {
@@ -212,11 +198,7 @@ protected:
                         TestImageGenerator::Color(), info.width());
             bytePtr += rowBytes;
         }
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-        return kSuccess;
-#else
         return true;
-#endif
     }
 
 private: