Stop FaviconHandler from querying GetActiveFaviconValidity() part 2/2

components/favicon/ios/web_favicon_driver.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/favicon/ios/web_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/favicon/ios/favicon_url_util.h"
 #include "ios/web/public/browser_state.h"
@@ skipping 54 matching lines @@
   DCHECK(web_state());
   return web_state()->GetBrowserState()->IsOffTheRecord();
 }
 
 GURL WebFaviconDriver::GetActiveURL() {
   web::NavigationItem* item =
       web_state()->GetNavigationManager()->GetVisibleItem();
   return item ? item->GetURL() : GURL();
 }
 
-bool WebFaviconDriver::GetActiveFaviconValidity() {
-  return !ActiveURLChangedSinceFetchFavicon() && GetFaviconStatus().valid;
-}
-
 void WebFaviconDriver::SetActiveFaviconValidity(bool validity) {
   GetFaviconStatus().valid = validity;
 }
 
 GURL WebFaviconDriver::GetActiveFaviconURL() {
-  return ActiveURLChangedSinceFetchFavicon() ? GURL() : GetFaviconStatus().url;
+  return GetFaviconStatus().url;
 }
 
 void WebFaviconDriver::SetActiveFaviconURL(const GURL& url) {
   GetFaviconStatus().url = url;
 }
 
 void WebFaviconDriver::SetActiveFaviconImage(const gfx::Image& image) {
   GetFaviconStatus().image = image;
 }
 
-bool WebFaviconDriver::ActiveURLChangedSinceFetchFavicon() {
-  // On iOS the active URL can change in between calls to FetchFavicon(). For
-  // instance, FetchFavicon() is not synchronously called when the active URL
-  // changes as a result of CRWSessionController::goToEntry().
-  // TODO(stuartmorgan): Remove this once iOS always triggers favicon fetches
-  // synchronously after active URL changes.
-  return GetActiveURL() != fetch_favicon_url_;
-}
-
 web::FaviconStatus& WebFaviconDriver::GetFaviconStatus() {
-  DCHECK(!ActiveURLChangedSinceFetchFavicon());
+  DCHECK(web_state()->GetNavigationManager()->GetVisibleItem());
   return web_state()->GetNavigationManager()->GetVisibleItem()->GetFavicon();
 }
 
 WebFaviconDriver::WebFaviconDriver(web::WebState* web_state,
                                    FaviconService* favicon_service,
                                    history::HistoryService* history_service,
                                    bookmarks::BookmarkModel* bookmark_model)
     : web::WebStateObserver(web_state),
       FaviconDriverImpl(favicon_service, history_service, bookmark_model) {
 }
 
 WebFaviconDriver::~WebFaviconDriver() {
 }
 
 void WebFaviconDriver::FaviconUrlUpdated(
     const std::vector<web::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   OnUpdateFaviconURL(GetActiveURL(), FaviconURLsFromWebFaviconURLs(candidates));
 }
 
 }  // namespace favicon