Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 259 matching lines @@
         preview->web_contents()->GetController().GetActiveEntry();
     DCHECK_EQ(last_navigation->url, entry->GetURL());
 
     // Add the page to history.
     preview->history_tab_helper()->UpdateHistoryForNavigation(last_navigation);
 
     // Update the page title.
     preview->history_tab_helper()->UpdateHistoryPageTitle(*entry);
 
     // Update the favicon.
-    FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-        preview->profile(), Profile::EXPLICIT_ACCESS);
+    FaviconService* favicon_service =
+        preview->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
     if (favicon_service && entry->GetFavicon().valid &&
         entry->GetFavicon().image.IsEmpty()) {
       std::vector<unsigned char> image_data;
       // TODO: Add all variants once the history service supports it.
       gfx::PNGCodec::EncodeBGRASkBitmap(
           entry->GetFavicon().image.AsBitmap(), false, &image_data);
       favicon_service->SetFavicon(entry->GetURL(),
                                   entry->GetFavicon().url,
                                   image_data,
                                   history::FAVICON);
@@ skipping 292 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }