Replace uses of legacy SkImageGenerator API

cc/test/skia_common.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/skia_common.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
@@ skipping 11 matching lines @@
  public:
   explicit TestImageGenerator(const SkImageInfo& info)
       : SkImageGenerator(info),
         image_backing_memory_(info.getSafeSize(info.minRowBytes()), 0),
         image_pixmap_(info, image_backing_memory_.data(), info.minRowBytes()) {}
 
  protected:
   bool onGetPixels(const SkImageInfo& info,
                    void* pixels,
                    size_t rowBytes,
-                   SkPMColor ctable[],
-                   int* ctableCount) override {
+                   const Options&) override {
     return image_pixmap_.readPixels(info, pixels, rowBytes, 0, 0);
   }
 
  private:
   std::vector<uint8_t> image_backing_memory_;
   SkPixmap image_pixmap_;
 };
 
 }  // anonymous namespace
 
@@ skipping 23 matching lines @@
 
   return !memcmp(pixels_a.get(), pixels_b.get(), pixel_size);
 }
 
 sk_sp<SkImage> CreateDiscardableImage(const gfx::Size& size) {
   return SkImage::MakeFromGenerator(base::MakeUnique<TestImageGenerator>(
       SkImageInfo::MakeN32Premul(size.width(), size.height())));
 }
 
 }  // namespace cc