Stop FaviconHandler from querying GetActiveFaviconValidity() part 1/2

The combination of:
- The existence of |FaviconHandler::history_results_|
- The checking against duplicate calls to FaviconHandler::OnUpdateFaviconURL()
  introduced in https://codereview.chromium.org/1295733002
makes the GetActiveFaviconValidity() / GetActiveFaviconURL() check in
FaviconHandler::ProcessCurrentUrl() unnecessary

BUG=517089

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

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

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;
   }