Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/jumplist_win.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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 531 matching lines @@
         TabRestoreServiceFactory::GetForProfile(profile_);
     if (tab_restore_service)
       tab_restore_service->RemoveObserver(this);
     registrar_.reset();
   }
   profile_ = NULL;
 }
 
 void JumpList::CancelPendingUpdate() {
   if (handle_) {
-    FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-        profile_, Profile::EXPLICIT_ACCESS);
+    FaviconService* favicon_service =
+        profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     favicon_service->CancelRequest(handle_);
     handle_ = NULL;
   }
 }
 
 void JumpList::Terminate() {
   CancelPendingUpdate();
   RemoveObserver();
 }
 
@@ skipping 103 matching lines @@
   GURL url;
   {
     base::AutoLock auto_lock(list_lock_);
     if (icon_urls_.empty())
       return false;
     // Ask FaviconService if it has a favicon of a URL.
     // When FaviconService has one, it will call OnFaviconDataAvailable().
     url = GURL(icon_urls_.front().first);
   }
   FaviconService* favicon_service =
-      FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+      profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   handle_ = favicon_service->GetFaviconForURL(
-      profile_, url, history::FAVICON, &favicon_consumer_,
+      url, history::FAVICON, &favicon_consumer_,
       base::Bind(&JumpList::OnFaviconDataAvailable, base::Unretained(this)));
   return true;
 }
 
 void JumpList::OnFaviconDataAvailable(
     FaviconService::Handle handle,
     history::FaviconData favicon) {
   // If there is currently a favicon request in progress, it is now outdated,
   // as we have received another, so nullify the handle from the old request.
   handle_ = NULL;
@@ skipping 68 matching lines @@
     if ((*item)->data().get() &&
         gfx::PNGCodec::Decode((*item)->data()->front(),
                               (*item)->data()->size(),
                               &icon_bitmap)) {
       FilePath icon_path;
       if (CreateIconFile(icon_bitmap, icon_dir_, &icon_path))
         (*item)->SetIcon(icon_path.value(), 0, true);
     }
   }
 }