move favicon download code from chrome/ into content/

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 "chrome/common/icon_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 
 // static
 std::vector<ui::ScaleFactor> FaviconUtil::GetFaviconScaleFactors() {
   const float kScale1x = ui::GetScaleFactorScale(ui::SCALE_FACTOR_100P);
   std::vector<ui::ScaleFactor> favicon_scale_factors =
       ui::GetSupportedScaleFactors();
@@ skipping 10 matching lines @@
       insert_index = i;
       break;
     }
   }
   favicon_scale_factors.insert(favicon_scale_factors.begin() + insert_index,
                                ui::SCALE_FACTOR_100P);
   return favicon_scale_factors;
 }
 
 // static
-int FaviconUtil::DownloadFavicon(content::RenderViewHost* rvh,
-                                 const GURL& url,
-                                 int image_size) {
-  static int id = 0;
-  rvh->Send(new IconMsg_DownloadFavicon(rvh->GetRoutingID(), ++id, url,
-            image_size));
-  return id;
-}
-// static
 gfx::Image FaviconUtil::SelectFaviconFramesFromPNGs(
       const std::vector<history::FaviconBitmapResult>& png_data,
       const std::vector<ui::ScaleFactor> scale_factors,
       int favicon_size) {
   std::vector<SkBitmap> bitmaps;
   for (size_t i = 0; i < png_data.size(); ++i) {
     if (!png_data[i].is_valid())
       continue;
 
     SkBitmap bitmap;
@@ skipping 19 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];
 }