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 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 {
+class FaviconService : public CancelableRequestProvider,
+                       public ProfileKeyedService {
  public:
   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
@@ skipping 63 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:
   Profile* profile_;

[andreip3000, 2012/08/17 10:11:26]

I think this dependency must go. You can just inject the HistoryService into the
FaviconService at construction time. Sadly, there is one other use of profile_
in favicon_service.cc that will take a while to untangle (that's why I left a
TODO in my CL).

http://codereview.chromium.org/10857037/

[rpetterson, 2012/08/19 01:10:01]

I think I've gotten rid of all the profile dependencies. PTAL.

On 2012/08/17 10:11:26, andreip3000 wrote:

 
   // 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_