SkBitmap::Config is deprecated, use SkColorType instead

ui/gfx/android/java_bitmap.cc

Index: ui/gfx/android/java_bitmap.cc
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
index 7512b4222b1a103c29bcb65ddc0eb42932d4b860..1194aa41a7caa0552c1a31b6401486de5c87f5bd 100644
--- a/ui/gfx/android/java_bitmap.cc
+++ b/ui/gfx/android/java_bitmap.cc
@@ -120,21 +120,21 @@ SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) {
   return skbitmap;
 }
 
-SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config) {
+SkColorType ConvertToSkiaColorType(jobject bitmap_config) {
   int jbitmap_config = Java_BitmapHelper_getBitmapFormatForConfig(
       AttachCurrentThread(), bitmap_config);
   switch (jbitmap_config) {
     case BITMAP_FORMAT_ALPHA_8:
-      return SkBitmap::kA8_Config;
+      return kAlpha_8_SkColorType;
     case BITMAP_FORMAT_ARGB_4444:
-      return SkBitmap::kARGB_4444_Config;
+      return kARGB_4444_SkColorType;
     case BITMAP_FORMAT_ARGB_8888:
-      return SkBitmap::kARGB_8888_Config;
+      return kN32_SkColorType;
     case BITMAP_FORMAT_RGB_565:
-      return SkBitmap::kRGB_565_Config;
+      return kRGB_565_SkColorType;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
-      return SkBitmap::kNo_Config;
+      return kUnknown_SkColorType;
   }
 }