Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/favicon/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 "build/build_config.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_util.h"
 
 using content::NavigationEntry;
@@ skipping 124 matching lines @@
 
 int FaviconHandler::DownloadImage(
     const GURL& image_url,
     int image_size,
     history::IconType icon_type,
     const FaviconTabHelper::ImageDownloadCallback& callback) {
   return ScheduleDownload(GURL(), image_url, image_size, icon_type, callback);
 }
 
 FaviconService* FaviconHandler::GetFaviconService() {
-  return FaviconServiceFactory::GetForProfile(
-      profile_, Profile::EXPLICIT_ACCESS);
+  return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,
                                             const GURL& image_url,
                                             const gfx::Image& image,
                                             float score,
                                             history::IconType icon_type) {
   bool update_candidate = false;
   SkBitmap bitmap = *(image.ToSkBitmap());
   bool exact_match = score == 1;
@@ skipping 194 matching lines @@
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconDataCallback& callback) {
   GetFaviconService()->GetFavicon(icon_url, icon_type, consumer, callback);
 }
 
 void FaviconHandler::GetFaviconForURL(
     const GURL& page_url,
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconDataCallback& callback) {
-  GetFaviconService()->GetFaviconForURL(profile_, page_url, icon_types,
-                                        consumer, callback);
+  GetFaviconService()->GetFaviconForURL(page_url, icon_types, consumer,
+                                        callback);
 }
 
 void FaviconHandler::SetHistoryFavicon(
     const GURL& page_url,
     const GURL& icon_url,
     const std::vector<unsigned char>& image_data,
     history::IconType icon_type) {
   GetFaviconService()->SetFavicon(page_url, icon_url, image_data, icon_type);
 }
 
@@ skipping 145 matching lines @@
   int height = bitmap.height();
   if (width > 0 && height > 0) {
     gfx::CalculateFaviconTargetSize(&width, &height);
     return gfx::Image(skia::ImageOperations::Resize(
                           bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
                           width, height));
   }
 
   return image;
 }