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

content/public/browser/favicon_status.h

Index: content/public/browser/favicon_status.h
diff --git a/content/public/browser/favicon_status.h b/content/public/browser/favicon_status.h
index 6d5a8792135f83c85419262c5fcf8443ca739365..0899169db9b39d281df5e27ad53697b60e074ee4 100644
--- a/content/public/browser/favicon_status.h
+++ b/content/public/browser/favicon_status.h
@@ -7,6 +7,7 @@
 
 #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 {
@@ -26,7 +27,10 @@ struct CONTENT_EXPORT FaviconStatus {
   // 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.
 };