SkBitmap::Config is deprecated, use SkColorType instead

ui/gfx/color_analysis_unittest.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.
 
 #include "ui/gfx/color_analysis.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 131 matching lines @@
   return (abs(expected - static_cast<int>(channel)) <= 1);
 }
 
 // Compute minimal and maximal graylevel (or alphalevel) of the input |bitmap|.
 // |bitmap| has to be allocated and configured to kA8_Config.
 void Calculate8bitBitmapMinMax(const SkBitmap& bitmap,
                                uint8_t* min_gl,
                                uint8_t* max_gl) {
   SkAutoLockPixels bitmap_lock(bitmap);
   DCHECK(bitmap.getPixels());
-  DCHECK(bitmap.config() == SkBitmap::kA8_Config);
+  DCHECK(bitmap.colorType() == kAlpha_8_SkColorType);

[msw, 2014/07/07 19:47:51]

nit: DCHECK_EQ

[reed1, 2014/07/07 19:51:46]

Done.

   DCHECK(min_gl);
   DCHECK(max_gl);
   *min_gl = std::numeric_limits<uint8_t>::max();
   *max_gl = std::numeric_limits<uint8_t>::min();
   for (int y = 0; y < bitmap.height(); ++y) {
     uint8_t* current_color = bitmap.getAddr8(0, y);
     for (int x = 0; x < bitmap.width(); ++x, ++current_color) {
       *min_gl = std::min(*min_gl, *current_color);
       *max_gl = std::max(*max_gl, *current_color);
     }
@@ skipping 333 matching lines @@
   Calculate8bitBitmapMinMax(result, &min_gl, &max_gl);
 
   EXPECT_EQ(0, min_gl);
   EXPECT_EQ(255, max_gl);
   EXPECT_EQ(min_gl, SkColorGetA(result.getColor(0, 0)));
   EXPECT_EQ(max_gl, SkColorGetA(result.getColor(299, 199)));
   EXPECT_EQ(93U, SkColorGetA(result.getColor(150, 0)));
 }
 
 }  // namespace color_utils