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

chrome/browser/prerender/prerender_render_view_host_observer.cc

 // 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.
 
 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"
 
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/render_messages.h"
 
@@ skipping 39 matching lines @@
 }
 
 // The base class declares this as protected so this is just here to make it
 // public so it is visible to the caller.
 bool PrerenderRenderViewHostObserver::Send(IPC::Message* message) {
   return content::RenderViewHostObserver::Send(message);
 }
 
 void PrerenderRenderViewHostObserver::OnUpdateFaviconURL(
     int32 page_id,
-    const std::vector<FaviconURL>& urls) {
+    const std::vector<content::FaviconURL>& urls) {
   prerender_contents_->OnUpdateFaviconURL(page_id, urls);
 }
 
 void PrerenderRenderViewHostObserver::OnMaybeCancelPrerenderForHTML5Media() {
   prerender_contents_->Destroy(FINAL_STATUS_HTML5_MEDIA);
 }
 
 void PrerenderRenderViewHostObserver::OnCancelPrerenderForPrinting() {
   prerender_contents_->Destroy(FINAL_STATUS_WINDOW_PRINT);
 }
 
 }