Simplify FaviconDriverImpl by removing extra FaviconHandler member.

components/favicon/core/favicon_driver_impl.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/core/favicon_driver_impl.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 29 matching lines @@
 #endif
 
 }  // namespace
 
 FaviconDriverImpl::FaviconDriverImpl(FaviconService* favicon_service,
                                      history::HistoryService* history_service,
                                      bookmarks::BookmarkModel* bookmark_model)
     : favicon_service_(favicon_service),
       history_service_(history_service),
       bookmark_model_(bookmark_model) {
+  bool download_large_icons = kEnableTouchIcon || IsIconNTPEnabled();
   favicon_handler_.reset(new FaviconHandler(
-      favicon_service_, this, FaviconHandler::FAVICON, kEnableTouchIcon));
-  if (kEnableTouchIcon) {
+      favicon_service_, this, FaviconHandler::FAVICON, download_large_icons));
+  if (download_large_icons) {
     touch_icon_handler_.reset(new FaviconHandler(favicon_service_, this,
                                                  FaviconHandler::TOUCH, true));
   }
-  if (IsIconNTPEnabled()) {
-    large_icon_handler_.reset(new FaviconHandler(favicon_service_, this,
-                                                 FaviconHandler::LARGE, true));
-  }
 }
 
 FaviconDriverImpl::~FaviconDriverImpl() {
 }
 
 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::SaveFavicon() {
   GURL active_url = GetActiveURL();
   if (active_url.is_empty())
     return;
 
   // Make sure the page is in history, otherwise adding the favicon does
   // nothing.
   if (!history_service_)
@@ skipping 25 matching lines @@
     if (favicon_service_)
       favicon_service_->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(id, image_url, bitmaps,
                                          original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     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) {
   return bookmark_model_ && bookmark_model_->IsBookmarked(url);
 }
 
 void FaviconDriverImpl::OnFaviconAvailable(const gfx::Image& image,
                                            const GURL& icon_url,
                                            bool is_active_favicon) {
   if (is_active_favicon) {
@@ skipping 10 matching lines @@
   }
   if (!image.IsEmpty())
     NotifyFaviconAvailable(image);
 }
 
 bool FaviconDriverImpl::HasPendingTasksForTest() {
   if (favicon_handler_->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;
 }
 
 bool FaviconDriverImpl::WasUnableToDownloadFavicon(const GURL& url) {
   return favicon_service_ && favicon_service_->WasUnableToDownloadFavicon(url);
 }
 
 void FaviconDriverImpl::SetFaviconOutOfDateForPage(const GURL& url,
                                                    bool force_reload) {
   if (favicon_service_) {
     favicon_service_->SetFaviconOutOfDateForPage(url);
     if (force_reload)
       favicon_service_->ClearUnableToDownloadFavicons();
   }
 }
 
 void FaviconDriverImpl::OnUpdateFaviconURL(
     const std::vector<FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   favicon_handler_->OnUpdateFaviconURL(candidates);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(candidates);
-  if (large_icon_handler_.get())
-    large_icon_handler_->OnUpdateFaviconURL(candidates);
 }
 
 }  // namespace favicon