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

content/public/browser/favicon_status.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_
 #define CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_
 
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
+#include "ui/gfx/image/image.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
 
 // Collects the favicon related information for a NavigationEntry.
 struct CONTENT_EXPORT FaviconStatus {
   FaviconStatus();
 
   // Indicates whether we've gotten an official favicon for the page, or are
   // just using the default favicon.
   bool valid;
 
   // The URL of the favicon which was used to load it off the web.
   GURL url;
 
   // The favicon bitmap for the page. If the favicon has not been explicitly
   // set or it empty, it will return the default favicon. Note that this is
   // loaded asynchronously, so even if the favicon URL is valid we may return
   // the default favicon if we haven't gotten the data yet.
-  SkBitmap bitmap;
+  gfx::Image image;
+
+  // Returns 1x resolution of image. This function should eventually go away.

[sky, 2012/08/03 17:17:59]

move above fields.

+  SkBitmap AsBitmap() const;
 
   // Copy and assignment is explicitly allowed for this struct.
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_