SkBitmap::Config is no more, use SkColorType

chrome/browser/thumbnails/content_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 "chrome/browser/thumbnails/content_analysis.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <functional>
@@ skipping 14 matching lines @@
 
 namespace {
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
 unsigned long ImagePixelSum(const SkBitmap& bitmap, const gfx::Rect& rect) {
   // Get the sum of pixel values in the rectangle. Applicable only to
   // monochrome bitmaps.
-  DCHECK_EQ(SkBitmap::kA8_Config, bitmap.config());
+  DCHECK_EQ(kAlpha_8_SkColorType, bitmap.colorType());
   unsigned long total = 0;
   for (int r = rect.y(); r < rect.bottom(); ++r) {
     const uint8* row_data = static_cast<const uint8*>(
         bitmap.getPixels()) + r * bitmap.rowBytes();
     for (int c = rect.x(); c < rect.right(); ++c)
       total += row_data[c];
   }
 
   return total;
 }
@@ skipping 655 matching lines @@
 
   int histogram[256] = {};
   color_utils::BuildLumaHistogram(result, histogram);
   int non_zero_color_count = std::count_if(
       histogram, histogram + 256, std::bind2nd(std::greater<int>(), 0));
   EXPECT_GT(non_zero_color_count, 4);
 
 }
 
 }  // namespace thumbnailing_utils