Remove SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS

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 "SkCachingPixelRef.h"
 #include "SkCanvas.h"
@@ skipping 164 matching lines @@
         SkASSERT((fType <= kLast_TestType) && (fType >= 0));
     }
     virtual ~TestImageGenerator() { }
 
 protected:
     static SkImageInfo GetMyInfo() {
         return SkImageInfo::MakeN32(TestImageGenerator::Width(), TestImageGenerator::Height(),
                                     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) {
             sk_memset32(reinterpret_cast<SkColor*>(bytePtr),
                         TestImageGenerator::Color(), info.width());
             bytePtr += rowBytes;
         }
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-        return kSuccess;
-#else
         return true;
-#endif
     }
 
 private:
     const TestType fType;
     skiatest::Reporter* const fReporter;
 
     typedef SkImageGenerator INHERITED;
 };
 
 static void check_test_image_generator_bitmap(skiatest::Reporter* reporter,
@@ skipping 122 matching lines @@
         canvas.clear(kDefaultColor);
         canvas.drawImage(image, 0, 0, NULL);
         if (TestImageGenerator::kSucceedGetPixels_TestType == test) {
             REPORTER_ASSERT(
                     r, TestImageGenerator::Color() == *bitmap.getAddr32(0, 0));
         } else {
             REPORTER_ASSERT(r, kDefaultColor == bitmap.getColor(0,0));
         }
     }
 }