Refactor FaviconDriver::OnFaviconAvailable()

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 30 matching lines @@
 
 }  // 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) {
   favicon_handler_.reset(new FaviconHandler(
-      favicon_service_, this, kEnableTouchIcon ? FaviconHandler::LARGEST_FAVICON
-                                               : FaviconHandler::FAVICON));
+      favicon_service_, this, kEnableTouchIcon
+                                  ? FaviconDriverObserver::NON_TOUCH_LARGEST
+                                  : FaviconDriverObserver::NON_TOUCH_16_DIP));
   if (kEnableTouchIcon || IsIconNTPEnabled()) {
     touch_icon_handler_.reset(new FaviconHandler(
-        favicon_service_, this, FaviconHandler::LARGEST_TOUCH));
+        favicon_service_, this, FaviconDriverObserver::TOUCH_LARGEST));
   }
 }
 
 FaviconDriverImpl::~FaviconDriverImpl() {
 }
 
 void FaviconDriverImpl::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
@@ skipping 16 matching lines @@
   if (touch_icon_handler_.get()) {
     touch_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 GURL& page_url,
-                                           const GURL& icon_url,
-                                           const gfx::Image& image,
-                                           bool is_active_favicon) {
-  // Check whether the active URL has changed since FetchFavicon() was called.
-  // On iOS only, the active URL can change between calls to FetchFavicon().
-  // For instance, FetchFavicon() is not synchronously called when the active
-  // URL changes as a result of CRWSessionController::goToEntry().
-  if (page_url != GetActiveURL())
-    return;
-
-  if (is_active_favicon) {
-    bool icon_url_changed = GetActiveFaviconURL() != icon_url;
-    // No matter what happens, we need to mark the favicon as being set.
-    SetActiveFaviconValidity(true);
-    SetActiveFaviconURL(icon_url);
-
-    if (image.IsEmpty())
-      return;
-
-    SetActiveFaviconImage(image);
-    NotifyFaviconUpdated(icon_url_changed);
-  }
-  if (!image.IsEmpty())
-    NotifyFaviconAvailable(image);
-}
-
 bool FaviconDriverImpl::HasPendingTasksForTest() {
   if (favicon_handler_->HasPendingTasksForTest())
     return true;
   if (touch_icon_handler_ && touch_icon_handler_->HasPendingTasksForTest())
     return true;
   return false;
 }
 
 bool FaviconDriverImpl::WasUnableToDownloadFavicon(const GURL& url) {
   return favicon_service_ && favicon_service_->WasUnableToDownloadFavicon(url);
@@ skipping 11 matching lines @@
 void FaviconDriverImpl::OnUpdateFaviconURL(
     const GURL& page_url,
     const std::vector<FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   favicon_handler_->OnUpdateFaviconURL(page_url, candidates);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(page_url, candidates);
 }
 
 }  // namespace favicon