Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/favicon/favicon_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/ref_counted_util.h"
 
 class GURL;
-class HistoryService;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
 // backend behind the scenes.
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.
-class FaviconService : public CancelableRequestProvider,
-                       public ProfileKeyedService {
+class FaviconService : public CancelableRequestProvider {
  public:
-  explicit FaviconService(HistoryService* history_service);
+  explicit FaviconService(Profile* profile);
 
   virtual ~FaviconService();
 
   // Callback for GetFavicon. If we have previously inquired about the favicon
   // for this URL, |know_favicon| will be true, and the rest of the fields will
   // be valid (otherwise they will be ignored).
   //
   // On |know_favicon| == true, |data| will either contain the PNG encoded
   // favicon data, or it will be NULL to indicate that the site does not have
   // a favicon (in other words, we know the site doesn't have a favicon, as
@@ skipping 27 matching lines @@
                                       const FaviconDataCallback& callback);
 
   // Requests any |icon_types| of favicon for a web page URL. |consumer| is
   // notified when the bits have been fetched. |icon_types| can be any
   // combination of IconType value, but only one icon will be returned in the
   // priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON and FAVICON.
   //
   // Note: this version is intended to be used to retrieve the favicon of a
   // page that has been browsed in the past. |expired| in the callback is
   // always false.
-  Handle GetFaviconForURL(Profile* profile,
-                          const GURL& page_url,
+  Handle GetFaviconForURL(const GURL& page_url,
                           int icon_types,
                           CancelableRequestConsumerBase* consumer,
                           const FaviconDataCallback& callback);
 
   // Requests the favicon for |favicon_id|. The |consumer| is notified when the
   // bits have been fetched.
   Handle GetFaviconForID(history::FaviconID favicon_id,
                          CancelableRequestConsumerBase* consumer,
                          const FaviconDataCallback& callback);
 
@@ skipping 13 matching lines @@
   void SetImportedFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicon_usage);
 
   // Sets the favicon for a page.
   void SetFavicon(const GURL& page_url,
                   const GURL& icon_url,
                   const std::vector<unsigned char>& image_data,
                   history::IconType icon_type);
 
  private:
-  HistoryService* history_service_;
+  Profile* profile_;
 
   // Helper to forward an empty result if we cannot get the history service.
   void ForwardEmptyResultAsync(GetFaviconRequest* request);
 
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_