Revert 152904 - Moving FaviconService to a ProfileKeyedService.

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"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
@@ skipping 79 matching lines @@
     return;
 
   // Make sure the page is in history, otherwise adding the favicon does
   // nothing.
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       profile_->GetOriginalProfile(), Profile::IMPLICIT_ACCESS);
   if (!history)
     return;
   history->AddPageNoVisitForBookmark(entry->GetURL(), entry->GetTitle());
 
-  FaviconService* service = FaviconServiceFactory::GetForProfile(
-      profile_->GetOriginalProfile(), Profile::IMPLICIT_ACCESS);
+  FaviconService* service = profile_->
+      GetOriginalProfile()->GetFaviconService(Profile::IMPLICIT_ACCESS);
   if (!service)
     return;
   const FaviconStatus& favicon(entry->GetFavicon());
   if (!favicon.valid || favicon.url.is_empty() ||
       favicon.image.IsEmpty()) {
     return;
   }
   std::vector<unsigned char> image_data;
   // TODO: Save all representations.
   gfx::PNGCodec::EncodeBGRASkBitmap(
@@ skipping 39 matching lines @@
       content::Source<WebContents>(web_contents()),
       content::NotificationService::NoDetails());
   web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
 }
 
 void FaviconTabHelper::NavigateToPendingEntry(
     const GURL& url,
     NavigationController::ReloadType reload_type) {
   if (reload_type != NavigationController::NO_RELOAD &&
       !profile_->IsOffTheRecord()) {
-    FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-        profile_, Profile::IMPLICIT_ACCESS);
+    FaviconService* favicon_service =
+        profile_->GetFaviconService(Profile::IMPLICIT_ACCESS);
     if (favicon_service)
       favicon_service->SetFaviconOutOfDateForPage(url);
   }
 }
 
 void FaviconTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(details.entry->GetURL());
@@ skipping 22 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);
   }
 }