Merge pull request #927 from uazo/fix-788

Fix favicons search for fallback

build/bromite_patches_list.txt

@@ -157,3 +157,4 @@ webview-Hard-no-to-persistent-histograms.patch
 Ignore-managed-state-and-policies-for-secure-DNS.patch
 Do-not-permit-user-installed-certificates.patch
 Automated-domain-substitution.patch
+fix-favicons-fallback.patch

build/patches/fix-favicons-fallback.patch

@@ -0,0 +1,25 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 13 Feb 2021 10:34:06 +0000
+Subject: Fix favicons search for fallback
+
+---
+ components/favicon/core/favicon_database.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc
+--- a/components/favicon/core/favicon_database.cc
++++ b/components/favicon/core/favicon_database.cc
+@@ -782,7 +782,9 @@ base::Optional<GURL> FaviconDatabase::FindFirstPageURLForHost(
+ 
+   // Bind the host with a prefix of "://" and suffix of "/" to ensure the entire
+   // host name is matched.
+-  statement.BindString(0, base::StringPrintf("%%://%s/%%", url.host().c_str()));
++  statement.BindString(0, base::StringPrintf("%s://%s/%%", 
++                            std::string(url.scheme_piece()).c_str(), 
++                            url.host().c_str()));
+ 
+   while (statement.Step()) {
+     favicon_base::IconType icon_type =
+-- 
+2.17.1
+