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

chrome/browser/prerender/prerender_contents.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_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 481 matching lines @@
   // TODO(ajwong): Remove the temporary map once prerendering is aware of
   // multiple session storage namespaces per tab.
   content::SessionStorageNamespaceMap session_storage_namespace_map;
   session_storage_namespace_map[""] = session_storage_namespace;
   return  WebContents::CreateWithSessionStorage(
       profile_, NULL, MSG_ROUTING_NONE, NULL, session_storage_namespace_map);
 }
 
 void PrerenderContents::OnUpdateFaviconURL(
     int32 page_id,
-    const std::vector<FaviconURL>& urls) {
+    const std::vector<content::FaviconURL>& urls) {
   VLOG(1) << "PrerenderContents::OnUpdateFaviconURL" << icon_url_;
-  for (std::vector<FaviconURL>::const_iterator it = urls.begin();
+  for (std::vector<content::FaviconURL>::const_iterator it = urls.begin();
        it != urls.end(); ++it) {
-    if (it->icon_type == FaviconURL::FAVICON) {
+    if (it->icon_type == content::FaviconURL::FAVICON) {
       icon_url_ = it->icon_url;
       VLOG(1) << icon_url_;
       return;
     }
   }
 }
 
 bool PrerenderContents::AddAliasURL(const GURL& url) {
   const bool http = url.SchemeIs(chrome::kHttpScheme);
   const bool https = url.SchemeIs(chrome::kHttpsScheme);
@@ skipping 191 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender