Componentize FaviconService and FaviconHandler

components/favicon/core/browser/favicon_handler.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_handler.h"
+#include "components/favicon/core/browser/favicon_handler.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "build/build_config.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "components/favicon/core/browser/favicon_client.h"
+#include "components/favicon/core/browser/favicon_service.h"
 #include "components/favicon/core/favicon_driver.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
 using favicon::FaviconURL;
 
@@ skipping 90 matching lines @@
 // Returns true if at least one of |bitmap_results| is valid.
 bool HasValidResult(
     const std::vector<favicon_base::FaviconRawBitmapResult>& bitmap_results) {
   return std::find_if(bitmap_results.begin(), bitmap_results.end(), IsValid) !=
       bitmap_results.end();
 }
 
 // Returns the index of the entry with the largest area.
 int GetLargestSizeIndex(const std::vector<gfx::Size>& sizes) {
   DCHECK(!sizes.empty());
-  int ret = 0;
+  size_t ret = 0;
   for (size_t i = 1; i < sizes.size(); ++i) {
     if (sizes[ret].GetArea() < sizes[i].GetArea())
       ret = i;
   }
-  return ret;
+  return static_cast<int>(ret);
 }
 
 // Return the index of a size which is same as the given |size|, -1 returned if
 // there is no such bitmap.
 int GetIndexBySize(const std::vector<gfx::Size>& sizes,
                    const gfx::Size& size) {
   DCHECK(!sizes.empty());
   std::vector<gfx::Size>::const_iterator i =
       std::find(sizes.begin(), sizes.end(), size);
   if (i == sizes.end())
@@ skipping 541 matching lines @@
       continue;
 
     gfx::Size largest =
         image_url.icon_sizes[GetLargestSizeIndex(image_url.icon_sizes)];
     image_url.icon_sizes.clear();
     image_url.icon_sizes.push_back(largest);
   }
   std::stable_sort(image_urls_.begin(), image_urls_.end(),
                    CompareIconSize);
 }