favicon: moves FaviconServiceImpl into it's own target

This is in preparation for using favicons in WebLayer, which won't
use history.

BUG=1076463
TEST=covered by tests

Change-Id: I4adc5bd015cfdda16e3189f30df5a854dc0a4a05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2305038Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789675}

chrome/browser/BUILD.gn

@@ -1911,6 +1911,7 @@ static_library("browser") {
     "//components/error_page/common",
     "//components/favicon/content",
     "//components/favicon/core",
+    "//components/favicon/core:history_implementation",
     "//components/favicon_base",
     "//components/feature_engagement",
     "//components/federated_learning",

components/favicon/core/BUILD.gn

@@ -15,8 +15,6 @@ static_library("core") {
     "favicon_handler.cc",
     "favicon_handler.h",
     "favicon_service.h",
-    "favicon_service_impl.cc",
-    "favicon_service_impl.h",
     "favicon_url.cc",
     "favicon_url.h",
     "favicon_util.cc",
@@ -35,7 +33,6 @@ static_library("core") {
     "//base",
     "//base:i18n",
     "//components/favicon_base",
-    "//components/history/core/browser",
     "//components/image_fetcher/core",
     "//components/keyed_service/core",
     "//net:net",
@@ -46,6 +43,25 @@ static_library("core") {
   ]
 }
 
+# This target contains the implementation of FaviconService backed by
+# the HistoryService.
+static_library("history_implementation") {
+  sources = [
+    "favicon_service_impl.cc",
+    "favicon_service_impl.h",
+  ]
+
+  deps = [
+    ":core",
+    "//base",
+    "//components/favicon_base",
+    "//components/history/core/browser",
+    "//skia",
+    "//ui/gfx",
+    "//url",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -58,6 +74,7 @@ source_set("unit_tests") {
 
   deps = [
     ":core",
+    ":history_implementation",
     "//base",
     "//base/test:test_support",
     "//components/favicon/core/test:test_support",

components/favicon/core/large_icon_service.h

@@ -20,7 +20,8 @@ class GURL;
 
 namespace favicon {
 
-// The large icon service provides methods to access large icons.
+// The large icon service provides methods to access large icons. The actual
+// implementation of this uses Google's favicon service.
 class LargeIconService : public KeyedService {
  public:
   // Requests the best large icon for the page at |page_url|.

components/ntp_tiles/BUILD.gn

@@ -89,6 +89,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//build:branding_buildflags",
     "//components/favicon/core",
+    "//components/favicon/core:history_implementation",
     "//components/favicon_base",
     "//components/history/core/test",
     "//components/image_fetcher/core",

ios/chrome/browser/favicon/BUILD.gn

@@ -23,6 +23,7 @@ source_set("favicon") {
   deps = [
     "//base",
     "//components/favicon/core",
+    "//components/favicon/core:history_implementation",
     "//components/favicon_base",
     "//components/image_fetcher/core",
     "//components/image_fetcher/ios",