move favicon download code from chrome/ into content/

content/renderer/favicon_helper.h

 // Copyright (c) 2011 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_RENDERER_FAVICON_HELPER_H_
-#define CHROME_RENDERER_FAVICON_HELPER_H_
+#ifndef CONTENT_RENDERER_FAVICON_HELPER_H_
+#define CONTENT_RENDERER_FAVICON_HELPER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "googleurl/src/gurl.h"
 
+class SkBitmap;
+
+namespace content {
 struct FaviconURL;
-class SkBitmap;
+}
 
 namespace webkit_glue {
 class MultiResolutionImageResourceFetcher;
 }
 
+namespace content {
+
+struct FaviconURL;
+
 // This class deals with favicon downloading.
 // There is one FaviconHelper per RenderView, which is owned by the RenderView.
-class FaviconHelper : public content::RenderViewObserver {
+class FaviconHelper : public RenderViewObserver {
  public:
-  explicit FaviconHelper(content::RenderView* render_view);
+  explicit FaviconHelper(RenderView* render_view);
 
  private:
   virtual ~FaviconHelper();
 
   // Message handler.
   void OnDownloadFavicon(int id, const GURL& image_url, int image_size);
 
   // Requests to download a favicon image. When done, the RenderView
   // is notified by way of DidDownloadFavicon. Returns true if the
   // request was successfully started, false otherwise. id is used to
@@ skipping 10 matching lines @@
       int requested_size,
       webkit_glue::MultiResolutionImageResourceFetcher* fetcher,
       const std::vector<SkBitmap>& images);
 
   // Decodes a data: URL image or returns an empty image in case of failure.
   SkBitmap ImageFromDataUrl(const GURL&) const;
 
   // Send a message to update the favicon URL for a page.
   void SendUpdateFaviconURL(int32 routing_id,
                             int32 page_id,
-                            const std::vector<FaviconURL>& urls);
+                            const std::vector<content::FaviconURL>& urls);

[jam, 2012/11/27 01:16:31]

nit: get rid of "content::"

[Cait (Slow), 2012/11/28 00:11:45]

Done.

 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
   virtual void DidChangeIcon(WebKit::WebFrame* frame,
                              WebKit::WebIconURL::Type icon_type) OVERRIDE;
 
   typedef ScopedVector<webkit_glue::MultiResolutionImageResourceFetcher>
     ImageResourceFetcherList;
 
   // ImageResourceFetchers schedule via DownloadImage.
   ImageResourceFetcherList image_fetchers_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHelper);
 };
 
-#endif  // CHROME_RENDERER_FAVICON_HELPER_H_
+} // namespace content
+
+#endif  // CONTENT_RENDERER_FAVICON_HELPER_H_