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

chrome/browser/prerender/prerender_contents.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_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_origin.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/referrer.h"
 #include "ui/gfx/size.h"
 
 class Profile;
 class TabContents;
-struct FaviconURL;
+
 
 namespace base {
 class ProcessMetrics;
 }
 
 namespace content {
+struct FaviconURL;
 class RenderViewHost;
 class SessionStorageNamespace;
 class WebContents;
 }
 
 namespace history {
 struct HistoryAddPageArgs;
 }
 
 namespace prerender {
@@ skipping 255 matching lines @@
 
  private:
   class TabContentsDelegateImpl;
 
   // Needs to be able to call the constructor.
   friend class PrerenderContentsFactoryImpl;
 
   friend class PrerenderRenderViewHostObserver;
 
   // Message handlers.
-  void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
+  void OnUpdateFaviconURL(int32 page_id,
+                          const std::vector<content::FaviconURL>& urls);
 
   // Returns the RenderViewHost Delegate for this prerender.
   content::WebContents* GetWebContents();
 
   // Returns the ProcessMetrics for the render process, if it exists.
   base::ProcessMetrics* MaybeGetProcessMetrics();
 
   // The prerender manager owning this object.
   PrerenderManager* prerender_manager_;
 
@@ skipping 82 matching lines @@
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_