favicon handler: Consider all frames when receiving favicons from the history db

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/favicon/select_favicon_frames.h"
@@ skipping 105 matching lines @@
   }
   std::vector<unsigned char> image_data;
   // TODO: Save all representations.
   gfx::PNGCodec::EncodeBGRASkBitmap(
       favicon.image.AsBitmap(), false, &image_data);
   service->SetFavicon(
       entry->GetURL(), favicon.url, image_data, history::FAVICON);
 }
 
 int FaviconTabHelper::DownloadImage(const GURL& image_url,
-                                 int image_size,
-                                 history::IconType icon_type,
-                                 const ImageDownloadCallback& callback) {
+                                    int image_size,
+                                    history::IconType icon_type,
+                                    const ImageDownloadCallback& callback) {
   if (icon_type == history::FAVICON)
     return favicon_handler_->DownloadImage(image_url, image_size, icon_type,
                                            callback);
   else if (touch_icon_handler_.get())
     return touch_icon_handler_->DownloadImage(image_url, image_size, icon_type,
                                               callback);
   return 0;
 }
 
 void FaviconTabHelper::OnUpdateFaviconURL(
@@ skipping 64 matching lines @@
   scale_factors = ui::GetSupportedScaleFactors();
   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);
   }
 }