Add favicon integration tests for FaviconDriverImpl

components/favicon/ios/web_favicon_driver.mm

 // 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 "base/threading/sequenced_worker_pool.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/favicon/ios/favicon_url_util.h"
@@ skipping 37 matching lines @@
   fetch_favicon_url_ = url;
   FaviconDriverImpl::FetchFavicon(url);
 }
 
 gfx::Image WebFaviconDriver::GetFavicon() const {
   web::NavigationItem* item =
       web_state()->GetNavigationManager()->GetLastCommittedItem();
   return item ? item->GetFavicon().image : gfx::Image();
 }
 
-bool WebFaviconDriver::FaviconIsValid() const {
-  web::NavigationItem* item =
-      web_state()->GetNavigationManager()->GetLastCommittedItem();
-  return item ? item->GetFavicon().valid : false;
-}
-
-GURL WebFaviconDriver::GetActiveURL() {
-  web::NavigationItem* item =
-      web_state()->GetNavigationManager()->GetVisibleItem();
-  return item ? item->GetURL() : GURL();
-}
-
 int WebFaviconDriver::DownloadImage(const GURL& url,
                                     int max_image_size,
                                     ImageDownloadCallback callback) {
   if (WasUnableToDownloadFavicon(url)) {
     DVLOG(1) << "Skip Failed FavIcon: " << url;
     return 0;
   }
 
   static int downloaded_image_count = 0;
   int local_download_id = ++downloaded_image_count;
@@ skipping 44 matching lines @@
 
   NotifyFaviconUpdatedObservers(notification_icon_type, icon_url,
                                 icon_url_changed, image);
 }
 
 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),
+      FaviconDriverImpl(/*enable_touch_icons=*/true,
+                        favicon_service,
+                        history_service,
+                        bookmark_model),
       image_fetcher_(web_state->GetBrowserState()->GetRequestContext(),
                      web::WebThread::GetBlockingPool()) {}
 
 WebFaviconDriver::~WebFaviconDriver() {
 }
 
 void WebFaviconDriver::FaviconUrlUpdated(
     const std::vector<web::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
-  OnUpdateFaviconURL(GetActiveURL(), FaviconURLsFromWebFaviconURLs(candidates));
+
+  web::NavigationItem* item =
+      web_state()->GetNavigationManager()->GetVisibleItem();
+
+  OnUpdateFaviconURL(item ? item->GetURL() : GURL(),
+                     FaviconURLsFromWebFaviconURLs(candidates));
 }
 
 }  // namespace favicon