Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/3044430…

tests/BitmapGetColorTest.cpp

 /*
  * Copyright 2011 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 "SkRandom.h"
 #include "SkRect.h"
@@ skipping 19 matching lines @@
     // specify an area that doesn't touch (0,0) and may extend beyond the
     // bitmap bounds (to test that we catch that in eraseArea
     const SkColor initColor = 0xFF0000FF;
     const SkIRect area = { 1, 1, 3, 3 };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
         SkImageInfo info = SkImageInfo::Make(2, 2, gRec[i].fColorType,
                                              kPremul_SkAlphaType);
         SkBitmap bm;
         uint32_t storage[4];
-        bm.installPixels(info, storage, info.minRowBytes(), NULL, NULL);
+        bm.installPixels(info, storage, info.minRowBytes());
 
         bm.eraseColor(initColor);
         bm.eraseArea(area, gRec[i].fInColor);
 
         SkColor c = bm.getColor(1, 1);
         REPORTER_ASSERT(reporter, c == gRec[i].fOutColor);
     }
 }