move favicon download code from chrome/ into content/

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 "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/common/favicon_url.h"
 #include "chrome/common/ref_counted_util.h"
+#include "content/public/common/favicon_url.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 class FaviconHandlerDelegate;
 class Profile;
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
@@ skipping 59 matching lines @@
                  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,
-                          const std::vector<FaviconURL>& candidates);
+                          const std::vector<content::FaviconURL>& candidates);
 
   // Processes the current image_irls_ entry, requesting the image from the
   // history / download service.
   void ProcessCurrentUrl();
 
   // Message handler for IconHostMsg_DidDownloadFavicon. Called when the icon
   // at |image_url| has been downloaded.
   // |bitmaps| is a list of all the frames of the icon at |image_url|.
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
                             int requested_size,
                             const std::vector<SkBitmap>& bitmaps);
 
   // For testing.
-  const std::deque<FaviconURL>& image_urls() const { return image_urls_; }
+  const std::deque<content::FaviconURL>& image_urls() const {
+    return image_urls_;
+  }
 
  protected:
   // These virtual methods make FaviconHandler testable and are overridden by
   // TestFaviconHandler.
 
   // Return the NavigationEntry for the active entry, or NULL if the active
   // entries URL does not match that of the URL last passed to FetchFavicon.
   virtual content::NavigationEntry* GetEntry();
 
   // Asks the render to download favicon, returns the request id.
@@ skipping 106 matching lines @@
   // NavigationEntry.
   // If the WebContents has a delegate, it is notified of the new favicon
   // (INVALIDATE_FAVICON).
   void UpdateFavicon(content::NavigationEntry* entry,
       const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results);
   void UpdateFavicon(content::NavigationEntry* entry, const gfx::Image* image);
 
   void FetchFaviconInternal();
 
   // Return the current candidate if any.
-  FaviconURL* current_candidate() {
+  content::FaviconURL* current_candidate() {
     return (image_urls_.size() > 0) ? &image_urls_[0] : NULL;
   }
 
   // Returns the preferred_icon_size according icon_types_, 0 means no
   // preference.
   int preferred_icon_size() {
     return icon_types_ == history::FAVICON ? gfx::kFaviconSize : 0;
   }
 
   // Used for history requests.
@@ skipping 13 matching lines @@
   bool favicon_expired_or_incomplete_;
 
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // The prioritized favicon candidates from the page back from the renderer.
-  std::deque<FaviconURL> image_urls_;
+  std::deque<content::FaviconURL> image_urls_;
 
   // The FaviconBitmapResults from history.
   std::vector<history::FaviconBitmapResult> history_results_;
 
   // The Profile associated with this handler.
   Profile* profile_;
 
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Current favicon candidate.
   FaviconCandidate favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_