Componentize FaviconService and FaviconHandler

components/favicon.gypi

Index: components/favicon.gypi
diff --git a/components/favicon.gypi b/components/favicon.gypi
index 262bd2b4fe60cbbba32eb76dd4f52a29b896acf6..09a78f22ce3733c066718f91b90b26510d6e79fa 100644
--- a/components/favicon.gypi
+++ b/components/favicon.gypi
@@ -10,12 +10,11 @@
       'type': 'static_library',
       'dependencies': [
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../url/url.gyp:url_lib',
         'favicon_base',
-        'keyed_service_core',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'favicon/core/browser/favicon_client.h',
         'favicon/core/favicon_driver.h',
         'favicon/core/favicon_url.cc',
         'favicon/core/favicon_url.h',
@@ -24,5 +23,32 @@
         '..',
       ],
     },
+    {
+      # GN version: //components/favicon/core/browser
+      'target_name': 'favicon_core_browser',
+      'type': 'static_library',
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        '../ui/gfx/gfx.gyp:gfx',
+        '../url/url.gyp:url_lib',
+        'bookmarks_browser',
+        'favicon_base',
+        'favicon_core',
+        'history_core_browser',
+        'keyed_service_core',
+      ],
+      'sources': [
+        # Note: sources list duplicated in GN build.
+        'favicon/core/browser/favicon_client.h',
+        'favicon/core/browser/favicon_handler.cc',
+        'favicon/core/browser/favicon_handler.h',
+        'favicon/core/browser/favicon_service.cc',
+        'favicon/core/browser/favicon_service.h',
+        'favicon/core/browser/favicon_tab_helper_observer.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
   ],
 }