color_utils cleanup:

chrome/browser/extensions/bookmark_app_helper.cc

 // Copyright 2014 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/extensions/bookmark_app_helper.h"
 
 #include <stddef.h>
 
 #include <cctype>
 #include <string>
@@ skipping 75 matching lines @@
   explicit GeneratedIconImageSource(char letter, SkColor color, int output_size)
       : gfx::CanvasImageSource(gfx::Size(output_size, output_size), false),
         letter_(letter),
         color_(color),
         output_size_(output_size) {}
   ~GeneratedIconImageSource() override {}
 
  private:
   // gfx::CanvasImageSource overrides:
   void Draw(gfx::Canvas* canvas) override {
-    const unsigned char kLuminanceThreshold = 190;
+    const uint8_t kLumaThreshold = 190;
     const int icon_size = output_size_ * 3 / 4;
     const int icon_inset = output_size_ / 8;
     const size_t border_radius = output_size_ / 16;
     const size_t font_size = output_size_ * 7 / 16;
 
     std::string font_name =
         l10n_util::GetStringUTF8(IDS_SANS_SERIF_FONT_FAMILY);
 #if defined(OS_CHROMEOS)
     const std::string kChromeOSFontFamily = "Noto Sans";
     font_name = kChromeOSFontFamily;
 #endif
 
     // Draw a rounded rect of the given |color|.
     SkPaint background_paint;
     background_paint.setFlags(SkPaint::kAntiAlias_Flag);
     background_paint.setColor(color_);
 
     gfx::Rect icon_rect(icon_inset, icon_inset, icon_size, icon_size);
     canvas->DrawRoundRect(icon_rect, border_radius, background_paint);
 
     // The text rect's size needs to be odd to center the text correctly.
     gfx::Rect text_rect(icon_inset, icon_inset, icon_size + 1, icon_size + 1);
     // Draw the letter onto the rounded rect. The letter's color depends on the
-    // luminance of |color|.
-    unsigned char luminance = color_utils::GetLuminanceForColor(color_);
+    // luma of |color|.
+    const uint8_t luma = color_utils::Luma(color_);
     canvas->DrawStringRectWithFlags(
         base::string16(1, std::toupper(letter_)),
         gfx::FontList(gfx::Font(font_name, font_size)),
-        luminance > kLuminanceThreshold ? SK_ColorBLACK : SK_ColorWHITE,
+        (luma > kLumaThreshold) ? SK_ColorBLACK : SK_ColorWHITE,
         text_rect,
         gfx::Canvas::TEXT_ALIGN_CENTER);
   }
 
   char letter_;
 
   SkColor color_;
 
   int output_size_;
 
@@ skipping 660 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions