SkBitmap::Config is deprecated, use SkColorType instead

content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/compositing_iosurface_transformer_mac.h"
 
 #include <OpenGL/CGLCurrent.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <OpenGL/OpenGL.h>
@@ skipping 194 matching lines @@
 
 // Returns the number of pixels significantly different between |expected| and
 // |actual|.
 int ImageDifference(const SkBitmap& expected, const SkBitmap& actual) {
   SkAutoLockPixels lock_expected(expected);
   SkAutoLockPixels lock_actual(actual);
 
   // Sanity-check assumed image properties.
   DCHECK_EQ(expected.width(), actual.width());
   DCHECK_EQ(expected.height(), actual.height());
-  DCHECK_EQ(SkBitmap::kARGB_8888_Config, expected.config());
-  DCHECK_EQ(SkBitmap::kARGB_8888_Config, actual.config());
+  DCHECK_EQ(kN32_SkColorType, expected.colorType());
+  DCHECK_EQ(kN32_SkColorType, actual.colorType());
 
   // Compare both images.
   int num_pixels_different = 0;
   for (int y = 0; y < expected.height(); ++y) {
     const uint32_t* p = expected.getAddr32(0, y);
     const uint32_t* q = actual.getAddr32(0, y);
     for (int x = 0; x < expected.width(); ++x, ++p, ++q) {
       if (abs(static_cast<int>(SkColorGetR(*p)) -
               static_cast<int>(SkColorGetR(*q))) > kDifferenceThreshold ||
           abs(static_cast<int>(SkColorGetG(*p)) -
@@ skipping 294 matching lines @@
       // Subrect resize test: missing top row, and left+right columns in source.
       RunTransformRGBToYV12Test(
           src_bitmap,
           gfx::Rect(1, 1, params.src_width - 2, params.src_height - 1),
           dst_size);
     }
   }
 }
 
 }  // namespace content