Stop FaviconHandler from querying GetActiveFaviconValidity() part 1/2

components/favicon/core/favicon_handler.cc

Index: components/favicon/core/favicon_handler.cc
diff --git a/components/favicon/core/favicon_handler.cc b/components/favicon/core/favicon_handler.cc
index aea23c5e7415086ab53d7f60925c0d7e9f1e3108..d8ec1eaa58ad193058466179d9994f3914679129 100644
--- a/components/favicon/core/favicon_handler.cc
+++ b/components/favicon/core/favicon_handler.cc
@@ -384,17 +384,9 @@ void FaviconHandler::OnUpdateFaviconURL(
 void FaviconHandler::ProcessCurrentUrl() {
   DCHECK(!image_urls_.empty());
 
-  if (current_candidate()->icon_type == favicon_base::FAVICON &&
-      !download_largest_icon_) {
-    if (!favicon_expired_or_incomplete_ &&
-        driver_->GetActiveFaviconValidity() &&
-        DoUrlAndIconMatch(*current_candidate(),
-                          driver_->GetActiveFaviconURL(),
-                          favicon_base::FAVICON))
-      return;
-  } else if (!favicon_expired_or_incomplete_ && got_favicon_from_history_ &&
-             HasValidResult(history_results_) &&
-             DoUrlsAndIconsMatch(*current_candidate(), history_results_)) {
+  if (!favicon_expired_or_incomplete_ && got_favicon_from_history_ &&
+      HasValidResult(history_results_) &&
+      DoUrlsAndIconsMatch(*current_candidate(), history_results_)) {
     return;
   }