Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/favicon/favicon_util.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_util.h"
 
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "content/public/browser/render_view_host.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h"

[Cait (Slow), 2013/03/28 19:10:18]

needed?

[Dmitry Titov, 2013/03/28 22:52:40]

Done.

 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Creates image reps of DIP size |favicon_size| for the subset of
 // |scale_factors| for which the image reps can be created without resizing
 // or decoding the bitmap data.
 std::vector<gfx::ImagePNGRep> SelectFaviconFramesFromPNGsWithoutResizing(
@@ skipping 156 matching lines @@
     int desired_size) {
   std::vector<gfx::Size> sizes;
   for (size_t i = 0; i < bitmaps.size(); ++i)
     sizes.push_back(gfx::Size(bitmaps[i].width(), bitmaps[i].height()));
   std::vector<size_t> selected_bitmap_indices;
   SelectFaviconFrameIndices(sizes, scale_factors, desired_size,
                             &selected_bitmap_indices, NULL);
   DCHECK_EQ(1u, selected_bitmap_indices.size());
   return selected_bitmap_indices[0];
 }