Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"

src/image/SkImagePriv.h

Index: src/image/SkImagePriv.h
diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h
index 9f9cd12f6990917ad58a15ffd55876eb9eafd9ae..031832bd0d4edd3dbbdd55fe023b4f97c651c8ec 100644
--- a/src/image/SkImagePriv.h
+++ b/src/image/SkImagePriv.h
@@ -11,8 +11,6 @@
 #include "SkBitmap.h"
 #include "SkImage.h"
 
-extern SkBitmap::Config SkImageInfoToBitmapConfig(const SkImageInfo&);
-
 // Call this if you explicitly want to use/share this pixelRef in the image
 extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
                                        size_t rowBytes);
@@ -23,7 +21,7 @@ extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
  *  be shared if either the bitmap is marked as immutable, or canSharePixelRef
  *  is true.
  *
- *  If the bitmap's config cannot be converted into a corresponding
+ *  If the bitmap's colortype cannot be converted into a corresponding
  *  SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
  *  NULL.
  */