Move select_favicon_frames_unittest.cc to favicon_base

Move select_favicon_frames_unittest.cc into the favicon_base
with the code that it is testing.

Add the unit_test to the components_unittests, including when
using gn build system.

BUG=359513

Review URL: https://codereview.chromium.org/851693003

Cr-Commit-Position: refs/heads/master@{#311437}

6 files changed, 24 insertions, 2 deletions

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 47f70ea..7316527 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -117,7 +117,6 @@
       'browser/history/history_unittest_base.h',
       'browser/history/in_memory_url_index_unittest.cc',
       'browser/history/scored_history_match_unittest.cc',
-      'browser/history/select_favicon_frames_unittest.cc',
       'browser/history/thumbnail_database_unittest.cc',
       'browser/history/top_sites_database_unittest.cc',
       'browser/history/top_sites_impl_unittest.cc',
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 739d387..cb58e34 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -240,6 +240,7 @@ test("components_unittests") {
     "//components/data_reduction_proxy/core/common:unit_tests",
     "//components/dom_distiller/core:unit_tests",
     "//components/domain_reliability:unit_tests",
+    "//components/favicon_base:unit_tests",
     "//components/google/core/browser:unit_tests",
     "//components/login:unit_tests",
     "//components/metrics:unit_tests",
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index c9dbf504..081ab7a 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -129,6 +129,7 @@
             'domain_reliability/test_util.h',
             'domain_reliability/uploader_unittest.cc',
             'domain_reliability/util_unittest.cc',
+            'favicon_base/select_favicon_frames_unittest.cc',
             # Note: GN tests converted to here, need to do the rest.
             'enhanced_bookmarks/enhanced_bookmark_model_unittest.cc',
             'enhanced_bookmarks/image_store_ios_unittest.mm',
@@ -356,7 +357,7 @@
             'components.gyp:content_settings_core_browser',
             'components.gyp:content_settings_core_common',
             'components.gyp:content_settings_core_test_support',
-            
+
             # Dependencies of packed CT EV white list
             'components.gyp:packed_ct_ev_whitelist',
 
@@ -383,6 +384,9 @@
             'components.gyp:enhanced_bookmarks',
             'components.gyp:enhanced_bookmarks_test_support',
 
+            # Dependencies of favicon_base
+            'components.gyp:favicon_base',
+
             # Dependencies of feedback
             'components.gyp:feedback_component',
 
diff --git a/components/favicon_base/BUILD.gn b/components/favicon_base/BUILD.gn
index 6e40b06..d1e5a75 100644
--- a/components/favicon_base/BUILD.gn
+++ b/components/favicon_base/BUILD.gn
@@ -16,7 +16,22 @@ source_set("favicon_base") {
   deps = [
     "//base",
     "//skia",
+    "//ui/base",
     "//ui/gfx",
     "//url",
   ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "select_favicon_frames_unittest.cc",
+  ]
+
+  deps = [
+    ":favicon_base",
+    "//testing/gtest",
+    "//ui/base",
+    "//ui/gfx",
+  ]
+}
diff --git a/components/favicon_base/DEPS b/components/favicon_base/DEPS
index 20ad28e..0265afa 100644
--- a/components/favicon_base/DEPS
+++ b/components/favicon_base/DEPS
@@ -3,4 +3,7 @@ include_rules = [
   "+third_party/skia/include",
   "+ui/base",
   "+ui/gfx",
+
+  # favicon_base is used on iOS.
+  "-content",
 ]
diff --git a/chrome/browser/history/select_favicon_frames_unittest.cc b/components/favicon_base/select_favicon_frames_unittest.cc
index df99c72..df99c72 100644
--- a/chrome/browser/history/select_favicon_frames_unittest.cc
+++ b/components/favicon_base/select_favicon_frames_unittest.cc