[Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton

components/favicon_base/fallback_icon_service.cc

 // Copyright 2015 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 "components/favicon_base/fallback_icon_service.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/favicon/core/browser/fallback_icon_client.h"

[sdefresne, 2015/03/17 09:41:52]

favicon_base component must not depends on favicon component. I'd suggest moving
fallback_icon_service.{h,cc} to components/favicon/core/browser if it need to
depends on fallback_icon_client.h or to move fallback_icon_client.h to
components/favicon_base.

I prefer the first option as the goal of favicon_base was to be as small as
possible, providing a common layer that both favicon and history could depends
on. Since history does not use FallbackIconService, there is no need to have it
in the favicon_base component.

[huangs, 2015/03/23 03:28:35]

Moved to components/favicon/core to join siblings favicon_service.* (browser
directory got deleted).

 #include "components/favicon_base/fallback_icon_style.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
@@ skipping 10 matching lines @@
 base::string16 GetFallbackIconText(const GURL& url) {
   std::string domain = net::registry_controlled_domains::GetDomainAndRegistry(
         url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
   return domain.empty() ? base::string16() :
       base::i18n::ToUpper(base::ASCIIToUTF16(domain.substr(0, 1)));
 }
 
 }  // namespace
 
 FallbackIconService::FallbackIconService(
-    const std::vector<std::string>& font_list)
-  : font_list_(font_list) {
+    FallbackIconClient* fallback_icon_client)
+    : fallback_icon_client_(fallback_icon_client) {
 }
 
 FallbackIconService::~FallbackIconService() {
 }
 
 std::vector<unsigned char> FallbackIconService::RenderFallbackIconBitmap(
     const GURL& icon_url,
     int size,
     const FallbackIconStyle& style) {
   int size_to_use = std::min(kMaxFallbackFaviconSize, size);
@@ skipping 28 matching lines @@
   base::string16 icon_text = GetFallbackIconText(icon_url);
   if (icon_text.empty())
     return;
   int font_size = static_cast<int>(size * style.font_size_ratio);
   if (font_size <= 0)
     return;
 
   // TODO(huangs): See how expensive gfx::FontList() is, and possibly cache.
   canvas->DrawStringRectWithFlags(
       icon_text,
-      gfx::FontList(font_list_, gfx::Font::NORMAL, font_size),
+      gfx::FontList(fallback_icon_client_->GetFontNameList(), gfx::Font::NORMAL,
+                    font_size),
       style.text_color,
       gfx::Rect(kOffsetX, kOffsetY, size, size),
       gfx::Canvas::TEXT_ALIGN_CENTER);
 }
 
 }  // namespace favicon_base