SkBitmap::Config is deprecated, use SkColorType instead

ui/gfx/image/image_unittest_util.cc

 // Copyright (c) 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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "ui/gfx/image/image_unittest_util.h"
 
 #include <cmath>
@@ skipping 85 matching lines @@
   }
   return true;
 }
 
 bool IsEqual(const SkBitmap& bmp1, const SkBitmap& bmp2) {
   if (bmp1.isNull() && bmp2.isNull())
     return true;
 
   if (bmp1.width() != bmp2.width() ||
       bmp1.height() != bmp2.height() ||
-      bmp1.config() != SkBitmap::kARGB_8888_Config ||
-      bmp2.config() != SkBitmap::kARGB_8888_Config) {
+      bmp1.colorType() != kN32_SkColorType ||
+      bmp2.colorType() != kN32_SkColorType) {
     return false;
   }
 
   SkAutoLockPixels lock1(bmp1);
   SkAutoLockPixels lock2(bmp2);
   if (!bmp1.getPixels() || !bmp2.getPixels())
     return false;
 
   for (int y = 0; y < bmp1.height(); ++y) {
     for (int x = 0; x < bmp1.width(); ++x) {
@@ skipping 136 matching lines @@
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX)
   return image1 == image2;
 #else
   return image1.BackedBySameObjectAs(image2);
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx