Remove redundant FaviconDriverImpl::large_icon_handler_ on Android

components/favicon/core/favicon_driver_impl.cc

Index: components/favicon/core/favicon_driver_impl.cc
diff --git a/components/favicon/core/favicon_driver_impl.cc b/components/favicon/core/favicon_driver_impl.cc
index 47bfced7622453c0ee92a894fd1645090761a9dc..dca52dfbe7d3b7218bf7786be3194324a850d3e3 100644
--- a/components/favicon/core/favicon_driver_impl.cc
+++ b/components/favicon/core/favicon_driver_impl.cc
@@ -50,14 +50,10 @@ FaviconDriverImpl::FaviconDriverImpl(FaviconService* favicon_service,
   favicon_handler_.reset(new FaviconHandler(
       favicon_service_, this, kEnableTouchIcon ? FaviconHandler::LARGEST_FAVICON
                                                : FaviconHandler::FAVICON));
-  if (kEnableTouchIcon) {
+  if (kEnableTouchIcon || IsIconNTPEnabled()) {
     touch_icon_handler_.reset(new FaviconHandler(
         favicon_service_, this, FaviconHandler::LARGEST_TOUCH));
   }
-  if (IsIconNTPEnabled()) {
-    large_icon_handler_.reset(new FaviconHandler(
-        favicon_service_, this, FaviconHandler::LARGEST_TOUCH));
-  }
 }
 
 FaviconDriverImpl::~FaviconDriverImpl() {
@@ -67,8 +63,6 @@ void FaviconDriverImpl::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
-  if (large_icon_handler_.get())
-    large_icon_handler_->FetchFavicon(url);
 }
 
 void FaviconDriverImpl::DidDownloadFavicon(
@@ -89,10 +83,6 @@ void FaviconDriverImpl::DidDownloadFavicon(
     touch_icon_handler_->OnDidDownloadFavicon(id, image_url, bitmaps,
                                               original_bitmap_sizes);
   }
-  if (large_icon_handler_.get()) {
-    large_icon_handler_->OnDidDownloadFavicon(id, image_url, bitmaps,
-                                              original_bitmap_sizes);
-  }
 }
 
 bool FaviconDriverImpl::IsBookmarked(const GURL& url) {
@@ -131,8 +121,6 @@ bool FaviconDriverImpl::HasPendingTasksForTest() {
     return true;
   if (touch_icon_handler_ && touch_icon_handler_->HasPendingTasksForTest())
     return true;
-  if (large_icon_handler_ && large_icon_handler_->HasPendingTasksForTest())
-    return true;
   return false;
 }
 
@@ -156,8 +144,6 @@ void FaviconDriverImpl::OnUpdateFaviconURL(
   favicon_handler_->OnUpdateFaviconURL(page_url, candidates);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(page_url, candidates);
-  if (large_icon_handler_.get())
-    large_icon_handler_->OnUpdateFaviconURL(page_url, candidates);
 }
 
 }  // namespace favicon