Replace content's faviconURL with components/favicon's

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 <deque>
 #include <map>
 #include <vector>
 
 #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 "content/public/common/favicon_url.h"
+#include "components/favicon/core/favicon_url.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 class FaviconClient;
 class FaviconDriver;
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
@@ skipping 56 matching lines @@
                  FaviconDriver* driver,
                  Type icon_type,
                  bool download_largest_icon);
   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(const std::vector<content::FaviconURL>& candidates);
+  void OnUpdateFaviconURL(const std::vector<favicon::FaviconURL>& candidates);
 
   // Processes the current image_irls_ entry, requesting the image from the
   // history / download service.
   void ProcessCurrentUrl();
 
   // Message handler for ImageHostMsg_DidDownloadImage. Called when the image
   // at |image_url| has been downloaded.
   // |bitmaps| is a list of all the frames of the image at |image_url|.
   // |original_bitmap_sizes| are the sizes of |bitmaps| before they were resized
   // to the maximum bitmap size passed to DownloadFavicon().
   void OnDidDownloadFavicon(
       int id,
       const GURL& image_url,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
   // For testing.
-  const std::vector<content::FaviconURL>& image_urls() const {
+  const std::vector<favicon::FaviconURL>& image_urls() const {
     return image_urls_;
   }
 
  protected:
   // These virtual methods make FaviconHandler testable and are overridden by
   // TestFaviconHandler.
 
   // Asks the render to download favicon, returns the request id.
   virtual int DownloadFavicon(const GURL& image_url, int max_bitmap_size);
 
@@ skipping 98 matching lines @@
                   const GURL& icon_url,
                   const gfx::Image& image,
                   favicon_base::IconType icon_type);
 
   // Sets the favicon's data.
   void SetFaviconOnActivePage(const std::vector<
       favicon_base::FaviconBitmapResult>& favicon_bitmap_results);
   void SetFaviconOnActivePage(const GURL& icon_url, const gfx::Image& image);
 
   // Return the current candidate if any.
-  content::FaviconURL* current_candidate() {
+  favicon::FaviconURL* current_candidate() {
     return (!image_urls_.empty()) ? &image_urls_.front() : NULL;
   }
 
   // Returns whether the page's url changed since the favicon was requested.
   bool PageChangedSinceFaviconWasRequested();
 
   // Returns the preferred size of the image. 0 means no preference (any size
   // will do).
   int preferred_icon_size() const {
     if (download_largest_icon_)
@@ skipping 25 matching lines @@
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // Whether the largest icon should be downloaded.
   const bool download_largest_icon_;
 
   // The prioritized favicon candidates from the page back from the renderer.
-  std::vector<content::FaviconURL> image_urls_;
+  std::vector<favicon::FaviconURL> image_urls_;
 
   // The FaviconBitmapResults from history.
   std::vector<favicon_base::FaviconBitmapResult> history_results_;
 
   // The client which implements embedder-specific Favicon operations.
   FaviconClient* client_;  // weak
 
   // This handler's driver.
   FaviconDriver* driver_;  // 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 current page 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_