Make icon_messages use the IPC macros for defining the structs and the serialization code, and mo...

chrome/browser/prerender/prerender_manager.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_manager.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 328 matching lines @@
     tc->DidNavigate(rvh, *p);
 
   string16 title = pc->title();
   if (!title.empty())
     tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
 
   GURL icon_url = pc->icon_url();
   if (!icon_url.is_empty()) {
     LOG(INFO) << "MaybeUsePreloadedPage";
     std::vector<FaviconURL> urls;
-    urls.push_back(FaviconURL(icon_url, FAVICON));
+    urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
     tc->favicon_helper().OnUpdateFaviconURL(pc->page_id(), urls);
   }
 
   if (pc->has_stopped_loading())
     tc->DidStopLoading();
 
   return true;
 }
 
 void PrerenderManager::RemoveEntry(PrerenderContents* entry) {
@@ skipping 224 matching lines @@
 
 bool PrerenderManager::IsTabContentsPrerendered(TabContents* tc) const {
   return prerendered_tc_set_.count(tc) > 0;
 }
 
 bool PrerenderManager::WouldTabContentsBePrerendered(TabContents* tc) const {
   return would_be_prerendered_tc_set_.count(tc) > 0;
 }
 
 }  // namespace prerender