Give SelectFaviconFrames a quality score.

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_util.h"
 #include "chrome/browser/favicon/select_favicon_frames.h"
 #include "chrome/browser/history/history.h"
@@ skipping 177 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;
   // TODO: Possibly do bitmap selection in FaviconHandler, so that it can score
   // favicons better.
   std::vector<ui::ScaleFactor> scale_factors;
 #if defined(OS_MACOSX)
   scale_factors = ui::GetSupportedScaleFactors();
 #else
   scale_factors.push_back(ui::SCALE_FACTOR_100P);  // TODO: Aura?
 #endif
-  gfx::Image favicon(
-      SelectFaviconFrames(bitmaps, scale_factors, requested_size));
-  favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
-  if (touch_icon_handler_.get())
-    touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
+  gfx::Image favicon(SelectFaviconFrames(
+      bitmaps, scale_factors, requested_size, &score));
+  favicon_handler_->OnDidDownloadFavicon(
+      id, image_url, errored, favicon, score);
+  if (touch_icon_handler_.get()) {
+    touch_icon_handler_->OnDidDownloadFavicon(
+        id, image_url, errored, favicon, score);
+  }
 }