Moves knowledge of Profile out of FaviconHandler, into FaviconTabHelper.

chrome/browser/favicon/favicon_handler.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_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/common/ref_counted_util.h"
 #include "content/public/common/favicon_url.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
+class FaviconClient;
 class FaviconHandlerDelegate;
 class Profile;
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace content {
 class NavigationEntry;
@@ skipping 45 matching lines @@
 // NavigationEntry and notifies the database to save the favicon.
 
 class FaviconHandler {
  public:
   enum Type {
     FAVICON,
     TOUCH,
   };
 
   FaviconHandler(Profile* profile,
+                 FaviconClient* client,
                  FaviconHandlerDelegate* delegate,
                  Type icon_type);
   virtual ~FaviconHandler();
 
   // Initiates loading the favicon for the specified url.
   void FetchFavicon(const GURL& url);
 
   // Message Handler.  Must be public, because also called from
   // PrerenderContents. Collects the |image_urls| list.
   void OnUpdateFaviconURL(int32 page_id,
@@ skipping 48 matching lines @@
       const GURL& page_url,
       int icon_types,
       const FaviconService::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   virtual void SetHistoryFavicons(const GURL& page_url,
                                   const GURL& icon_url,
                                   chrome::IconType icon_type,
                                   const gfx::Image& image);
 
-  virtual FaviconService* GetFaviconService();
-
   // Returns true if the favicon should be saved.
   virtual bool ShouldSaveFavicon(const GURL& url);
 
   // Notifies the delegate that the favicon for the active entry was updated.
   // |icon_url_changed| is true if a favicon with a different icon URL has been
   // selected since the previous call to NotifyFaviconUpdated().
   virtual void NotifyFaviconUpdated(bool icon_url_changed);
 
  private:
   friend class TestFaviconHandler; // For testing
@@ skipping 112 matching lines @@
 
   // The prioritized favicon candidates from the page back from the renderer.
   std::deque<content::FaviconURL> image_urls_;
 
   // The FaviconBitmapResults from history.
   std::vector<chrome::FaviconBitmapResult> history_results_;
 
   // The Profile associated with this handler.
   Profile* profile_;
 
+  // The client which implements embedder-specific Favicon operations.
+  FaviconClient* client_;  // weak
+
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Best image we've seen so far.  As images are downloaded from the page they
   // are stored here. When there is an exact match, or no more images are
   // available the favicon service and the NavigationEntry are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_