Cleanup FaviconHandler

chrome/browser/favicon/favicon_tab_helper.cc

 // Copyright (c) 2012 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 "chrome/browser/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 166 matching lines @@
   IPC_END_MESSAGE_MAP()
   return message_handled;
 }
 
 void FaviconTabHelper::OnDidDownloadFavicon(
     int id,
     const GURL& image_url,
     bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
-  float score = 0;
-  // TODO: Possibly do bitmap selection in FaviconHandler, so that it can score
-  // favicons better.
-  std::vector<ui::ScaleFactor> scale_factors;
-  scale_factors = ui::GetSupportedScaleFactors();
-  gfx::Image favicon(SelectFaviconFrames(
-      bitmaps, scale_factors, requested_size, &score));
   favicon_handler_->OnDidDownloadFavicon(
-      id, image_url, errored, favicon, score);
+      id, image_url, errored, requested_size, bitmaps);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
-        id, image_url, errored, favicon, score);
+        id, image_url, errored, requested_size, bitmaps);
   }
 }