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

chrome/browser/prerender/prerender_manager.cc

 // 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.
 
 #include "chrome/browser/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 421 matching lines @@
   // Merge the browsing history.
   new_tab_contents->web_contents()->GetController().CopyStateFromAndPrune(
       &old_tab_contents->web_contents()->GetController());
   CoreTabHelper::FromWebContents(old_tab_contents->web_contents())->delegate()->
       SwapTabContents(old_tab_contents->web_contents(),
                       new_tab_contents->web_contents());
   prerender_contents->CommitHistory(new_tab_contents);
 
   GURL icon_url = prerender_contents->icon_url();
   if (!icon_url.is_empty()) {
-    std::vector<FaviconURL> urls;
-    urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
+    std::vector<content::FaviconURL> urls;
+    urls.push_back(content::FaviconURL(icon_url, content::FaviconURL::FAVICON));
     FaviconTabHelper::FromWebContents(new_tab_contents->web_contents())->
         OnUpdateFaviconURL(prerender_contents->page_id(), urls);
   }
 
   // Update PPLT metrics:
   // If the tab has finished loading, record a PPLT of 0.
   // If the tab is still loading, reset its start time to the current time.
   PrerenderTabHelper* prerender_tab_helper =
       PrerenderTabHelper::FromWebContents(new_tab_contents->web_contents());
   DCHECK(prerender_tab_helper != NULL);
@@ skipping 897 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender