Convert FaviconStatus::bitmap from SkBitmap to gfx::Image.

chrome/browser/favicon/favicon_tab_helper.cc

Index: chrome/browser/favicon/favicon_tab_helper.cc
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index 84779f325e08937f51658343cc2559a68b23f6ff..2d0eda34d4305d19228bc78c3937ebb03454e097 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -55,11 +55,11 @@ SkBitmap FaviconTabHelper::GetFavicon() const {
   const NavigationController& controller = web_contents()->GetController();
   NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
-    return entry->GetFavicon().bitmap;
+    return entry->GetFavicon().AsBitmap();
 
   entry = controller.GetLastCommittedEntry();
   if (entry)
-    return entry->GetFavicon().bitmap;
+    return entry->GetFavicon().AsBitmap();
   return SkBitmap();
 }
 
@@ -107,11 +107,12 @@ void FaviconTabHelper::SaveFavicon() {
     return;
   const FaviconStatus& favicon(entry->GetFavicon());
   if (!favicon.valid || favicon.url.is_empty() ||
-      favicon.bitmap.empty()) {
+      favicon.image.IsEmpty()) {
     return;
   }
   std::vector<unsigned char> image_data;
-  gfx::PNGCodec::EncodeBGRASkBitmap(favicon.bitmap, false, &image_data);
+  // TODO: Save all representations.
+  gfx::PNGCodec::EncodeBGRASkBitmap(favicon.AsBitmap(), false, &image_data);
   service->SetFavicon(
       entry->GetURL(), favicon.url, image_data, history::FAVICON);
 }