Move chrome/common/favicon_url.(cc|h) into content/

chrome/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_
 
 #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;
 }
 
 // This class deals with favicon downloading.
 // There is one FaviconHelper per RenderView, which is owned by the RenderView.
 class FaviconHelper : public content::RenderViewObserver {
  public:
   explicit FaviconHelper(content::RenderView* render_view);
@@ skipping 20 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);
 
   // 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_