Change return type of FaviconTabHelper::GetFavicon() to gfx::Image.

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 361 matching lines @@
   }
   tab->history_tab_helper()->UpdateHistoryPageTitle(*active_entry);
 
   FaviconService* favicon_service =
       tab->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
 
   if (favicon_service && active_entry->GetFavicon().valid &&
       !active_entry->GetFavicon().image.IsEmpty()) {
     std::vector<unsigned char> image_data;
     // TODO: Add all variants once the history service supports it.
-    gfx::PNGCodec::EncodeBGRASkBitmap(active_entry->GetFavicon().AsBitmap(),
-                                      false, &image_data);
+    gfx::PNGCodec::EncodeBGRASkBitmap(
+        active_entry->GetFavicon().image.AsBitmap(), false, &image_data);
     favicon_service->SetFavicon(active_entry->GetURL(),
                                 active_entry->GetFavicon().url,
                                 image_data,
                                 history::FAVICON);
     if (supports_instant && !add_page_vector_.empty()) {
       // If we're using the instant API, then we've tweaked the url that is
       // going to be added to history. We need to also set the favicon for the
       // url we're adding to history (see comment in ReleasePreviewContents
       // for details).
       favicon_service->SetFavicon(add_page_vector_.back()->url,
@@ skipping 800 matching lines @@
     host->Send(new ChromeViewMsg_SearchBoxResize(
         host->GetRoutingID(), GetOmniboxBoundsInTermsOfPreview()));
   } else {
     host->Send(new ChromeViewMsg_SearchBoxChange(
         host->GetRoutingID(), user_text, verbatim, 0, 0));
   }
 
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->web_contents(), user_text, verbatim));
 }